public inbox for linux-staging@lists.linux.dev
 help / color / mirror / Atom feed
From: Dan Carpenter <error27@gmail.com>
To: yang.yang29@zte.com.cn
Cc: gustavoars@kernel.org, linux-staging@lists.linux.dev,
	linux-kernel@vger.kernel.org, xu.panda@zte.com.cn
Subject: Re: [PATCH linux-next] staging: ks7010: use strscpy() to instead of strncpy()
Date: Thu, 29 Dec 2022 12:54:28 +0300	[thread overview]
Message-ID: <Y61j1JRx0ZMeVjji@kadam> (raw)
In-Reply-To: <Y61hpuMcp3NKbqL5@kadam>

On Thu, Dec 29, 2022 at 12:45:10PM +0300, Dan Carpenter wrote:
> On Mon, Dec 26, 2022 at 07:03:24PM +0800, yang.yang29@zte.com.cn wrote:
> > From: Xu Panda <xu.panda@zte.com.cn>
> > 
> > The implementation of strscpy() is more robust and safer.
> > That's now the recommended way to copy NUL-terminated strings.
> > 
> > Signed-off-by: Xu Panda <xu.panda@zte.com.cn>
> > Signed-off-by: Yang Yang <yang.yang29@zte.com>
> > ---
> >  drivers/staging/ks7010/ks_wlan_net.c | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> > 
> > diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c
> > index 044c807ca022..e03c87f0bfe7 100644
> > --- a/drivers/staging/ks7010/ks_wlan_net.c
> > +++ b/drivers/staging/ks7010/ks_wlan_net.c
> > @@ -382,8 +382,7 @@ static int ks_wlan_get_nick(struct net_device *dev,
> >  		return -EPERM;
> > 
> >  	/* for SLEEP MODE */
> > -	strncpy(extra, priv->nick, 16);
> > -	extra[16] = '\0';
> > +	strscpy(extra, priv->nick, 17);
> 
> I think this code is a buffer overflow.  This is an implementation of
> SIOCGIWNICKN.
> 
> net/wireless/wext-core.c
>    169          [IW_IOCTL_IDX(SIOCGIWNICKN)] = {
>    170                  .header_type    = IW_HEADER_TYPE_POINT,
>    171                  .token_size     = 1,
>    172                  .max_tokens     = IW_ESSID_MAX_SIZE,
>    173          },
> 

Yeah.  I was wrong.  The extra size here is .max_tokens * .token_size so
it's 32.

Sorry for the noise!

Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>

regards,
dan carpenter


  parent reply	other threads:[~2022-12-29  9:54 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-26 11:03 [PATCH linux-next] staging: ks7010: use strscpy() to instead of strncpy() yang.yang29
2022-12-29  9:45 ` Dan Carpenter
2022-12-29  9:49   ` Dan Carpenter
2022-12-29  9:54   ` Dan Carpenter [this message]
2022-12-29  9:58     ` Dan Carpenter

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=Y61j1JRx0ZMeVjji@kadam \
    --to=error27@gmail.com \
    --cc=gustavoars@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    --cc=xu.panda@zte.com.cn \
    --cc=yang.yang29@zte.com.cn \
    /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