Message-ID: <4B4D86E3.9090207@bfs.de>
Date: Wed, 13 Jan 2010 09:40:03 +0100
From: walter harms <wharms@bfs.de>
Reply-To: wharms@bfs.de
User-Agent: Thunderbird 2.0.0.23 (X11/20090817)
MIME-Version: 1.0
To: Darren Jenkins <darrenrjenkins@gmail.com>
CC: David Airlie <airlied@linux.ie>,
       dri-devel mailing list <dri-devel@lists.sourceforge.net>,
       Kernel Janitors <kernel-janitors@vger.kernel.org>,
       Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: drivers/gpu/drm/radeon/radeon_cp.c: check for invalid radeon
 family
References: <1261660696.3546.40.camel@ICE-BOX>
In-Reply-To: <1261660696.3546.40.camel@ICE-BOX>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1175
Lines: 37


Darren Jenkins schrieb:
> If there is an invalid radeon family the fw_name is NULL and causes an
> NULL pointer dereference.
> This just adds a check for something unexpected.
> 
> Coverity CID: 13252
> 
> Signed-off-by: Darren Jenkins <darrenrjenkins@gmail.com>
> diff --git a/drivers/gpu/drm/radeon/radeon_cp.c
> b/drivers/gpu/drm/radeon/radeon_cp.c
> index 0b2f9c2..1e66337 100644
> --- a/drivers/gpu/drm/radeon/radeon_cp.c
> +++ b/drivers/gpu/drm/radeon/radeon_cp.c
> @@ -531,6 +531,8 @@ static int
> radeon_cp_init_microcode(drm_radeon_private_t *dev_priv)
>  		   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV570)) {
>  		DRM_INFO("Loading R500 Microcode\n");
>  		fw_name = FIRMWARE_R520;
> +	} else {
> +		return -EINVAL;
>  	}
>  
>  	err = request_firmware(&dev_priv->me_fw, fw_name, &pdev->dev);
> 
> 

Someone should take the job to clear the if forrest and replace it with switch()/case.

just my 2 cents,
 wh
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/