All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Laight <david.laight.linux@gmail.com>
To: Bart Van Assche <bvanassche@acm.org>
Cc: Thorsten Blum <thorsten.blum@linux.dev>,
	Don Brace <don.brace@microchip.com>,
	"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>,
	"Martin K. Petersen" <martin.petersen@oracle.com>,
	linux-hardening@vger.kernel.org, storagedev@microchip.com,
	linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] scsi: hpsa: Replace deprecated strncpy() with strscpy()
Date: Thu, 13 Feb 2025 22:30:32 +0000	[thread overview]
Message-ID: <20250213223032.20d64851@pumpkin> (raw)
In-Reply-To: <065b6317-8da8-42ec-8084-1a5058c0798a@acm.org>

On Thu, 13 Feb 2025 12:34:55 -0800
Bart Van Assche <bvanassche@acm.org> wrote:

> On 2/13/25 11:53 AM, Thorsten Blum wrote:
> > diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
> > index 84d8de07b7ae..c7ebae24b09f 100644
> > --- a/drivers/scsi/hpsa.c
> > +++ b/drivers/scsi/hpsa.c
> > @@ -460,9 +460,8 @@ static ssize_t host_store_hp_ssd_smart_path_status(struct device *dev,
> >   
> >   	if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))
> >   		return -EACCES;
> > -	len = count > sizeof(tmpbuf) - 1 ? sizeof(tmpbuf) - 1 : count;
> > -	strncpy(tmpbuf, buf, len);
> > -	tmpbuf[len] = '\0';
> > +	len = min(count + 1, sizeof(tmpbuf));
> > +	strscpy(tmpbuf, buf, len);
> >   	if (sscanf(tmpbuf, "%d", &status) != 1)
> >   		return -EINVAL;
> >   	h = shost_to_hba(shost);
> > @@ -484,9 +483,8 @@ static ssize_t host_store_raid_offload_debug(struct device *dev,
> >   
> >   	if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))
> >   		return -EACCES;
> > -	len = count > sizeof(tmpbuf) - 1 ? sizeof(tmpbuf) - 1 : count;
> > -	strncpy(tmpbuf, buf, len);
> > -	tmpbuf[len] = '\0';
> > +	len = min(count + 1, sizeof(tmpbuf));
> > +	strscpy(tmpbuf, buf, len);
> >   	if (sscanf(tmpbuf, "%d", &debug_level) != 1)
> >   		return -EINVAL;
> >   	if (debug_level < 0)  
> 
> Something I should have noticed earlier: this code occurs inside sysfs
> write callbacks. The strings passed to sysfs write callbacks are
> 0-terminated. Hence, 'buf' can be passed directly to sscanf() and
> tmpbuf[] can be removed. From kernfs_fop_write_iter() in fs/kernfs.c:
> 
> 	buf[len] = '\0';	/* guarantee string termination */

You might also want to use one of the stroul() family rather than sscanf().

	David.

> 
> Thanks,
> 
> Bart.
> 


  parent reply	other threads:[~2025-02-13 22:30 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-13 19:53 [PATCH v2] scsi: hpsa: Replace deprecated strncpy() with strscpy() Thorsten Blum
2025-02-13 20:34 ` Bart Van Assche
2025-02-13 20:36   ` Kees Cook
2025-02-13 22:30   ` David Laight [this message]
2025-02-13 20:35 ` Kees Cook

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=20250213223032.20d64851@pumpkin \
    --to=david.laight.linux@gmail.com \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=bvanassche@acm.org \
    --cc=don.brace@microchip.com \
    --cc=linux-hardening@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=storagedev@microchip.com \
    --cc=thorsten.blum@linux.dev \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.