From: Joe Perches <joe@perches.com>
To: Dan Carpenter <error27@gmail.com>
Cc: Lennert Buytenhek <buytenh@wantstofly.org>,
"David S. Miller" <davem@davemloft.net>,
Jiri Pirko <jpirko@redhat.com>,
Denis Kirjanov <kirjanov@gmail.com>,
Saeed Bishara <saeed@marvell.com>,
netdev@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [patch -next] mv643xx_eth: potential null dereference
Date: Fri, 23 Jul 2010 03:32:57 -0700 [thread overview]
Message-ID: <1279881177.24768.1623.camel@Joe-Laptop.home> (raw)
In-Reply-To: <20100723101528.GF26313@bicker>
On Fri, 2010-07-23 at 12:15 +0200, Dan Carpenter wrote:
> 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@gmail.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;
It's odd using two different check styles for the same
test on consecutive lines.
How about using the same style:
msp->tx_csum_limit = (pd != NULL && pd->tx_csum_limit) ?
pd->tx_csum_limit : 9 * 1024;
next prev parent reply other threads:[~2010-07-23 10:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-23 10:15 [patch -next] mv643xx_eth: potential null dereference Dan Carpenter
2010-07-23 10:32 ` Joe Perches [this message]
2010-07-23 11:05 ` [patch -next v2] " Dan Carpenter
2010-07-23 11:18 ` Lennert Buytenhek
2010-07-23 20:05 ` David Miller
2010-07-23 16:30 ` walter harms
2010-07-23 22:15 ` Dan Carpenter
2010-07-24 8:59 ` walter harms
2010-07-24 19:00 ` Lennert Buytenhek
2010-07-25 14:47 ` walter harms
2010-07-25 15:54 ` Lennert Buytenhek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1279881177.24768.1623.camel@Joe-Laptop.home \
--to=joe@perches.com \
--cc=buytenh@wantstofly.org \
--cc=davem@davemloft.net \
--cc=error27@gmail.com \
--cc=jpirko@redhat.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=kirjanov@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=saeed@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).