From: walter harms Subject: Re: drivers/gpu/drm/radeon/radeon_cp.c: check for invalid radeon family Date: Wed, 13 Jan 2010 09:40:03 +0100 Message-ID: <4B4D86E3.9090207@bfs.de> References: <1261660696.3546.40.camel@ICE-BOX> Reply-To: wharms@bfs.de Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1261660696.3546.40.camel@ICE-BOX> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.sourceforge.net To: Darren Jenkins Cc: David Airlie , dri-devel mailing list , Kernel Janitors , Linux Kernel Mailing List List-Id: dri-devel@lists.freedesktop.org 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 > 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 ------------------------------------------------------------------------------ This SF.Net email is sponsored by the Verizon Developer Community Take advantage of Verizon's best-in-class app development support A streamlined, 14 day to market process makes app distribution fast and easy Join now and get one step closer to millions of Verizon customers http://p.sf.net/sfu/verizon-dev2dev --