From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Fri, 23 Jul 2010 11:05:05 +0000 Subject: [patch -next v2] mv643xx_eth: potential null dereference Message-Id: <20100723110504.GG26313@bicker> List-Id: References: <20100723101528.GF26313@bicker> <1279881177.24768.1623.camel@Joe-Laptop.home> In-Reply-To: <1279881177.24768.1623.camel@Joe-Laptop.home> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Joe Perches Cc: Lennert Buytenhek , "David S. Miller" , Jiri Pirko , Denis Kirjanov , Saeed Bishara , netdev@vger.kernel.org, kernel-janitors@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 --- v2: style change 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); From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [patch -next v2] mv643xx_eth: potential null dereference Date: Fri, 23 Jul 2010 13:05:05 +0200 Message-ID: <20100723110504.GG26313@bicker> References: <20100723101528.GF26313@bicker> <1279881177.24768.1623.camel@Joe-Laptop.home> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Lennert Buytenhek , "David S. Miller" , Jiri Pirko , Denis Kirjanov , Saeed Bishara , netdev@vger.kernel.org, kernel-janitors@vger.kernel.org To: Joe Perches Return-path: 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 Content-Disposition: inline In-Reply-To: <1279881177.24768.1623.camel@Joe-Laptop.home> Sender: netdev-owner@vger.kernel.org List-ID: 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 --- v2: style change 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);