From: Daniel Wagner <dwagner@suse.de>
To: David Laight <david.laight.linux@gmail.com>
Cc: Daniel Wagner <wagi@kernel.org>,
James Smart <james.smart@broadcom.com>,
Dick Kennedy <dick.kennedy@broadcom.com>,
"James E.J. Bottomley" <James.Bottomley@hansenpartnership.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] lpfc: use memcpy for bios version
Date: Mon, 14 Apr 2025 09:51:08 +0200 [thread overview]
Message-ID: <6f6b4f8c-e9f3-4962-af48-baf48a91c0a9@flourine.local> (raw)
In-Reply-To: <20250413190238.2cb8ec64@pumpkin>
On Sun, Apr 13, 2025 at 07:02:38PM +0100, David Laight wrote:
> On Wed, 09 Apr 2025 13:34:22 +0200
> Daniel Wagner <wagi@kernel.org> wrote:
>
> > The strlcat with FORTIFY support is triggering a panic because it thinks
> > the target buffer will overflow although the correct target buffer
> > size is passed in.
BTW, still trying to figure out what is happening here. It was observed
on ppc64el but so far creating a crash dump is not working.
> > Anyway, instead memset with 0 followed by a strlcat, just use memcpy and
> > ensure that the resulting buffer is NULL terminated.
> >
> > BIOSVersion is only used for the lpfc_printf_log which expects a
> > properly terminated string.
> >
> > Signed-off-by: Daniel Wagner <wagi@kernel.org>
> > ---
> > drivers/scsi/lpfc/lpfc_sli.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
> > index 6574f9e744766d49e245bd648667cc3ffc45289e..a335d34070d3c5fa4778bb1cb0eef797c7194f3b 100644
> > --- a/drivers/scsi/lpfc/lpfc_sli.c
> > +++ b/drivers/scsi/lpfc/lpfc_sli.c
> > @@ -6003,9 +6003,9 @@ lpfc_sli4_get_ctl_attr(struct lpfc_hba *phba)
> > phba->sli4_hba.flash_id = bf_get(lpfc_cntl_attr_flash_id, cntl_attr);
> > phba->sli4_hba.asic_rev = bf_get(lpfc_cntl_attr_asic_rev, cntl_attr);
> >
> > - memset(phba->BIOSVersion, 0, sizeof(phba->BIOSVersion));
> > - strlcat(phba->BIOSVersion, (char *)cntl_attr->bios_ver_str,
> > + memcpy(phba->BIOSVersion, cntl_attr->bios_ver_str,
> > sizeof(phba->BIOSVersion));
> > + phba->BIOSVersion[sizeof(phba->BIOSVersion) - 1] = '\0';
>
> Isn't that just strscpy() ?
strscpy does more work to ensure everything is correct and has the
advantage that it wont copy the whole buffer unnecessary. Given how
small the work is BIOSVersion is 8 bytes and bios_ver_str is 32 bytes
and there are other places in the driver doing something similar thing,
I opted for the traditional memcpy with an explicit NULLing. Obviously,
it also avoids using any of the fortify features :)
next prev parent reply other threads:[~2025-04-14 7:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-09 11:34 Daniel Wagner
2025-04-11 19:42 ` Justin Tee
2025-04-12 1:31 ` Martin K. Petersen
2025-04-13 18:02 ` David Laight
2025-04-14 7:51 ` Daniel Wagner [this message]
2025-05-12 11:07 ` Daniel Wagner
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=6f6b4f8c-e9f3-4962-af48-baf48a91c0a9@flourine.local \
--to=dwagner@suse.de \
--cc=James.Bottomley@hansenpartnership.com \
--cc=david.laight.linux@gmail.com \
--cc=dick.kennedy@broadcom.com \
--cc=james.smart@broadcom.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=wagi@kernel.org \
/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
all inboxes | Powered by JetHome®