From: David Laight <david.laight.linux@gmail.com>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Kees Cook <kees@kernel.org>,
linux-hardening@vger.kernel.org, Arnd Bergmann <arnd@kernel.org>,
linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org,
Hannes Reinecke <hare@suse.com>,
"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>
Subject: Re: [PATCH next] drivers/scsi/aic7xxx/aic79xx_osm: Use kstrdup() instead of kmalloc() and strcpy()
Date: Sun, 7 Jun 2026 11:23:24 +0100 [thread overview]
Message-ID: <20260607112324.1015af5b@pumpkin> (raw)
In-Reply-To: <921d629d-79ac-46c3-8e7e-8ac92a50678a@wanadoo.fr>
On Sat, 6 Jun 2026 23:42:36 +0200
Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote:
> Le 06/06/2026 à 22:26, david.laight.linux@gmail.com a écrit :
> > From: David Laight <david.laight.linux@gmail.com>
> >
> > Signed-off-by: David Laight <david.laight.linux@gmail.com>
> > ---
> > This is one of a group of patches that remove potentially unbounded
> > strcpy() calls.
> >
> > They are mostly replaced by strscpy() or, when strlen() has just been
> > called, with memcpy() (usually including the '\0').
> >
> > Calls with copy string literals into arrays are left unchanged.
> > They are safe and easily detected as such.
> >
> > The changes were made by getting the compiler to detect the calls and
> > then fixing the code by hand.
> >
> > Note that all the changes are only compile tested.
> >
> > Some Makefiles were changed to allow files to contain strcpy().
> > As well as 'difficult to fix' files, this included 'show' functions
> > as they really need to use sysfs_emit() or seq_printf().
> >
> > All the patches are being sent individually to avoid very long cc lists.
> > Apologies for the terse commit messages and likely unexpected tags.
> > (There are about 100 patches in total.)
> >
> > drivers/scsi/aic7xxx/aic79xx_osm.c | 6 ++----
> > 1 file changed, 2 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
> > index feb1707feb7e..97ebee94230e 100644
> > --- a/drivers/scsi/aic7xxx/aic79xx_osm.c
> > +++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
> > @@ -1233,11 +1233,9 @@ ahd_linux_register_host(struct ahd_softc *ahd, struct scsi_host_template *templa
> > ahd_set_unit(ahd, ahd_linux_unit++);
> > ahd_unlock(ahd, &s);
> > sprintf(buf, "scsi%d", host->host_no);
> > - new_name = kmalloc(strlen(buf) + 1, GFP_ATOMIC);
> > - if (new_name != NULL) {
> > - strcpy(new_name, buf);
> > + new_name = kstrdup(buf, GFP_ATOMIC);
>
> I think that kasprintf() would simplify code and do the same.
>
> Otherwise, s/sprintf/snprintf/ could be done, as in the patch for
> aic7xxx_osm.c
Looks like I missed the sprintf() here.
I was doing a lot of simple changes and trying not to rewrite too much.
Looking a bit deeper into the ahd code there is an 8 byte pointer
that usually references an 8 byte buffer.
A fixed char name[16] will use less memory overall.
The only other thing it ever references is the result of:
sprintf(buf, "ahd_pci:%d:%d:%d",
ahd_get_pci_bus(pci),
ahd_get_pci_slot(pci),
ahd_get_pci_function(pci));
which it only does temporarily during ahd_linux_pci_dev_probe().
Even that is usually less than 16 bytes.
Given the probe function pretty much never fails, the scsi%d
string could be generated earlier with just a trace to tie
the two together.
But that is far beyond this set of changes.
Doing a 'v2' that isn't just an edit of the email will be a pita.
-- David
>
> CJ
>
> > + if (new_name != NULL)
> > ahd_set_name(ahd, new_name);
> > - }
> > host->unique_id = ahd->unit;
> > ahd_linux_initialize_scsi_bus(ahd);
> > ahd_intr_enable(ahd, TRUE);
>
prev parent reply other threads:[~2026-06-07 10:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-06 20:26 [PATCH next] drivers/scsi/aic7xxx/aic79xx_osm: Use kstrdup() instead of kmalloc() and strcpy() david.laight.linux
2026-06-06 21:42 ` Christophe JAILLET
2026-06-07 10:23 ` David Laight [this message]
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=20260607112324.1015af5b@pumpkin \
--to=david.laight.linux@gmail.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=arnd@kernel.org \
--cc=christophe.jaillet@wanadoo.fr \
--cc=hare@suse.com \
--cc=kees@kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/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