From patchwork Fri Jul 23 11:05:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 59767 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 384C61007D1 for ; Fri, 23 Jul 2010 21:05:30 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754121Ab0GWLFY (ORCPT ); Fri, 23 Jul 2010 07:05:24 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:39580 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751756Ab0GWLFX (ORCPT ); Fri, 23 Jul 2010 07:05:23 -0400 Received: by fxm14 with SMTP id 14so4930200fxm.19 for ; Fri, 23 Jul 2010 04:05:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=LX0wVSugNOfZbMQrVTvvG8XqRkxqkDiOHw+1zDfroLU=; b=OrjzuJSLrs0Oh9l9aJUI7LsNqNs6hMRUn4I5H0Hqgr3GXkCCcxkHT3tT1NyPxI36WQ iy8HEXotJ+sSQLLBTcmwkU1VmvNzDuKPY1T5x4JVM7uId2+oBOoddBMoITL9EvPyww1x bAesBoBqyoqMLrrYwxKGf9OmgAxACgpGPd9d4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=N57CYM7VdeV+CiCpVod3eiyMZT1SOoKlYA/lSbORnZCC7h/BdwsVCtFOZkYja/cOlf gQIWLaSDRWf35hK6LkkncYjRvxj+vWQHSf0Sh2aCyfX+RMbHz4V7/x94kARBe/L6WXRz bAunqSzj0gXC7WC3dg6FYRo9VvexfW72pwFnc= Received: by 10.86.71.4 with SMTP id t4mr2603057fga.5.1279883122225; Fri, 23 Jul 2010 04:05:22 -0700 (PDT) Received: from bicker ([205.177.176.130]) by mx.google.com with ESMTPS id e16sm43403fak.42.2010.07.23.04.05.13 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 23 Jul 2010 04:05:20 -0700 (PDT) Date: Fri, 23 Jul 2010 13:05:05 +0200 From: Dan Carpenter To: Joe Perches Cc: Lennert Buytenhek , "David S. Miller" , Jiri Pirko , Denis Kirjanov , Saeed Bishara , netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch -next v2] mv643xx_eth: potential null dereference Message-ID: <20100723110504.GG26313@bicker> References: <20100723101528.GF26313@bicker> <1279881177.24768.1623.camel@Joe-Laptop.home> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1279881177.24768.1623.camel@Joe-Laptop.home> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We assume that "pd" can be null on the previous line, and throughout the function so we should check it here as well. This was introduced by 9b2c2ff7a1c0 "mv643xx_eth: use sw csum for big packets" Signed-off-by: Dan Carpenter Acked-by: Lennert Buytenhek --- v2: style change -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index 73bb8ea..f5e72fe 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c @@ -2670,7 +2670,8 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev) * Detect hardware parameters. */ msp->t_clk = (pd != NULL && pd->t_clk != 0) ? pd->t_clk : 133000000; - msp->tx_csum_limit = pd->tx_csum_limit ? pd->tx_csum_limit : 9 * 1024; + msp->tx_csum_limit = (pd != NULL && pd->tx_csum_limit) ? + pd->tx_csum_limit : 9 * 1024; infer_hw_params(msp); platform_set_drvdata(pdev, msp);