[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1341251589.10180.721.camel@dhcp-10-12-137-160.irv.broadcom.com>
Date: Mon, 2 Jul 2012 10:53:08 -0700
From: "Eddie Wai" <eddie.wai@...adcom.com>
To: "Michael Chan" <mchan@...adcom.com>
cc: "Dan Carpenter" <dan.carpenter@...cle.com>,
"David Laight" <David.Laight@...LAB.COM>,
"James E.J. Bottomley" <JBottomley@...allels.com>,
"Barak Witkowski" <barak@...adcom.com>, linux-scsi@...r.kernel.org,
netdev@...r.kernel.org, "David S. Miller" <davem@...emloft.net>
Subject: Re: [patch] [SCSI] bnx2i: use strlcpy() instead of memcpy() for
strings
On Mon, 2012-07-02 at 08:13 -0700, Michael Chan wrote:
> 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@...cle.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@...adcom.com>
>
True. strlcpy() is the correct routine to use (instead of strncpy) as
this needs to be NULL terminated. Thanks.
Acked-by: Eddie Wai <eddie.wai@...adcom.com>
--
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