From: "Michael Chan" <mchan@broadcom.com>
To: "Dan Carpenter" <dan.carpenter@oracle.com>
Cc: "David Laight" <David.Laight@ACULAB.COM>,
"James E.J. Bottomley" <JBottomley@parallels.com>,
"Barak Witkowski" <barak@broadcom.com>,
"Eddie Wai" <eddie.wai@broadcom.com>,
linux-scsi@vger.kernel.org, netdev@vger.kernel.org,
"David S. Miller" <davem@davemloft.net>
Subject: Re: [patch] [SCSI] bnx2i: use strlcpy() instead of memcpy() for strings
Date: Mon, 2 Jul 2012 08:13:38 -0700 [thread overview]
Message-ID: <1341242018.7472.5.camel@LTIRV-MCHAN1.corp.ad.broadcom.com> (raw)
In-Reply-To: <20120702104843.GB4519@mwanda>
On Mon, 2012-07-02 at 13:48 +0300, Dan Carpenter wrote:
> On Mon, Jul 02, 2012 at 11:09:19AM +0100, David Laight wrote:
> > > Subject: [patch] [SCSI] bnx2i: use strlcpy() instead of memcpy() for
> > strings
> > >
> > > DRV_MODULE_VERSION here is "2.7.2.2" which is only 8 chars but we copy
> > > 12 bytes from the stack so it's a small information leak.
> > >
> > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > > ---
> > > This was just added to linux-next yesterday, but I'm not sure
> > > which tree it came from.
> > >
> > > diff --git a/drivers/scsi/bnx2i/bnx2i_init.c
> > > b/drivers/scsi/bnx2i/bnx2i_init.c
> > > index 7729a52..b17637a 100644
> > > --- a/drivers/scsi/bnx2i/bnx2i_init.c
> > > +++ b/drivers/scsi/bnx2i/bnx2i_init.c
> > > @@ -400,7 +400,7 @@ int bnx2i_get_stats(void *handle)
> > > if (!stats)
> > > return -ENOMEM;
> > >
> > > - memcpy(stats->version, DRV_MODULE_VERSION,
> > sizeof(stats->version));
> > > + strlcpy(stats->version, DRV_MODULE_VERSION,
> > sizeof(stats->version));
> > > memcpy(stats->mac_add1 + 2, hba->cnic->mac_addr, ETH_ALEN);
> >
> > Doesn't that leak the original contents of the last bytes of
> > stats->version instead?
>
> I'm pretty sure we set those to zero in bnx2x_handle_drv_info_req().
>
Yes, bnx2x zeros the whole stats structure, so strlcpy() is correct.
This came from the net-next tree, so David is the right persion to apply
this. Thanks.
Acked-by: Michael Chan <mchan@broadcom.com>
next prev parent reply other threads:[~2012-07-02 15:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-30 11:49 [patch] [SCSI] bnx2i: use strlcpy() instead of memcpy() for strings Dan Carpenter
2012-07-02 10:09 ` David Laight
2012-07-02 10:48 ` Dan Carpenter
2012-07-02 15:13 ` Michael Chan [this message]
2012-07-02 17:53 ` Eddie Wai
2012-07-09 6:51 ` David Miller
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=1341242018.7472.5.camel@LTIRV-MCHAN1.corp.ad.broadcom.com \
--to=mchan@broadcom.com \
--cc=David.Laight@ACULAB.COM \
--cc=JBottomley@parallels.com \
--cc=barak@broadcom.com \
--cc=dan.carpenter@oracle.com \
--cc=davem@davemloft.net \
--cc=eddie.wai@broadcom.com \
--cc=linux-scsi@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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).