From: Kees Cook <kees@kernel.org>
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_pad()
Date: Thu, 13 Feb 2025 12:19:46 -0800 [thread overview]
Message-ID: <202502131218.B53CB1EB@keescook> (raw)
In-Reply-To: <2c1fcd13-ffac-4590-a345-c5389d1ccc9f@acm.org>
On Thu, Feb 13, 2025 at 10:24:25AM -0800, Bart Van Assche wrote:
> On 2/13/25 3:40 AM, Thorsten Blum wrote:
> > diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
> > index c7ebae24b09f..968cefb497eb 100644
> > --- a/drivers/scsi/hpsa.c
> > +++ b/drivers/scsi/hpsa.c
> > @@ -7236,8 +7236,7 @@ static int hpsa_controller_hard_reset(struct pci_dev *pdev,
> > static void init_driver_version(char *driver_version, int len)
> > {
> > - memset(driver_version, 0, len);
> > - strncpy(driver_version, HPSA " " HPSA_DRIVER_VERSION, len - 1);
> > + strscpy_pad(driver_version, HPSA " " HPSA_DRIVER_VERSION, len);
> > }
> > static int write_driver_ver_to_cfgtable(struct CfgTable __iomem *cfgtable)
>
> Has it been considered to introduce a Coccinelle semantic patch that
> performs this conversion? See also the scripts/coccinelle directory.
Using this:
@pad0 depends on !(file in "tools") && !(file in "samples")@
expression DEST, SRC;
expression LENGTH;
@@
- memset(DEST, 0, LENGTH);
- strncpy(DEST, SRC, LENGTH - 1);
+ strscpy_pad(DEST, SRC, LENGTH);
@padNUL depends on !(file in "tools") && !(file in "samples")@
expression DEST, SRC;
expression LENGTH;
@@
- memset(DEST, '\0', LENGTH);
- strncpy(DEST, SRC, LENGTH - 1);
+ strscpy_pad(DEST, SRC, LENGTH);
It turns out this is the only place left in the kernel using that
pattern. :)
>
> Anyway:
>
> Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Kees Cook <kees@kernel.org>
--
Kees Cook
next prev parent reply other threads:[~2025-02-13 20:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-13 11:40 [PATCH v2] scsi: hpsa: Replace deprecated strncpy() with strscpy_pad() Thorsten Blum
2025-02-13 18:24 ` Bart Van Assche
2025-02-13 20:19 ` Kees Cook [this message]
2025-02-19 2:34 ` Martin K. Petersen
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=202502131218.B53CB1EB@keescook \
--to=kees@kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox