[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20100723101528.GF26313@bicker>
Date: Fri, 23 Jul 2010 12:15:28 +0200
From: Dan Carpenter <error27@...il.com>
To: Lennert Buytenhek <buytenh@...tstofly.org>
Cc: "David S. Miller" <davem@...emloft.net>,
Jiri Pirko <jpirko@...hat.com>,
Denis Kirjanov <kirjanov@...il.com>,
Saeed Bishara <saeed@...vell.com>, netdev@...r.kernel.org,
kernel-janitors@...r.kernel.org
Subject: [patch -next] mv643xx_eth: potential null dereference
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 <error27@...il.com>
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 2fcdb1e..9166f55 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -2675,7 +2675,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 && pd->tx_csum_limit) ?
+ pd->tx_csum_limit : 9 * 1024;
infer_hw_params(msp);
platform_set_drvdata(pdev, msp);
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists