* [PATCH] scsi: bnx2i: Replace all non-returning strlcpy with strscpy
@ 2023-05-17 14:31 Azeem Shaikh
2023-05-17 19:13 ` Kees Cook
2023-05-22 19:39 ` Kees Cook
0 siblings, 2 replies; 3+ messages in thread
From: Azeem Shaikh @ 2023-05-17 14:31 UTC (permalink / raw)
To: Nilesh Javali, Manish Rangankar, GR-QLogic-Storage-Upstream
Cc: linux-hardening, Azeem Shaikh, linux-scsi, linux-kernel,
James E.J. Bottomley, Martin K. Petersen
strlcpy() reads the entire source buffer first.
This read may exceed the destination size limit.
This is both inefficient and can lead to linear read
overflows if a source string is not NUL-terminated [1].
In an effort to remove strlcpy() completely [2], replace
strlcpy() here with strscpy().
No return values were used, so direct replacement is safe.
[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89
Signed-off-by: Azeem Shaikh <azeemshaikh38@gmail.com>
---
drivers/scsi/bnx2i/bnx2i_init.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/bnx2i/bnx2i_init.c b/drivers/scsi/bnx2i/bnx2i_init.c
index 2b3f0c10478e..872ad37e2a6e 100644
--- a/drivers/scsi/bnx2i/bnx2i_init.c
+++ b/drivers/scsi/bnx2i/bnx2i_init.c
@@ -383,7 +383,7 @@ int bnx2i_get_stats(void *handle)
if (!stats)
return -ENOMEM;
- strlcpy(stats->version, DRV_MODULE_VERSION, sizeof(stats->version));
+ strscpy(stats->version, DRV_MODULE_VERSION, sizeof(stats->version));
memcpy(stats->mac_add1 + 2, hba->cnic->mac_addr, ETH_ALEN);
stats->max_frame_size = hba->netdev->mtu;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] scsi: bnx2i: Replace all non-returning strlcpy with strscpy
2023-05-17 14:31 [PATCH] scsi: bnx2i: Replace all non-returning strlcpy with strscpy Azeem Shaikh
@ 2023-05-17 19:13 ` Kees Cook
2023-05-22 19:39 ` Kees Cook
1 sibling, 0 replies; 3+ messages in thread
From: Kees Cook @ 2023-05-17 19:13 UTC (permalink / raw)
To: Azeem Shaikh
Cc: Nilesh Javali, Manish Rangankar, GR-QLogic-Storage-Upstream,
linux-hardening, linux-scsi, linux-kernel, James E.J. Bottomley,
Martin K. Petersen
On Wed, May 17, 2023 at 02:31:30PM +0000, Azeem Shaikh wrote:
> strlcpy() reads the entire source buffer first.
> This read may exceed the destination size limit.
> This is both inefficient and can lead to linear read
> overflows if a source string is not NUL-terminated [1].
> In an effort to remove strlcpy() completely [2], replace
> strlcpy() here with strscpy().
> No return values were used, so direct replacement is safe.
>
> [1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
> [2] https://github.com/KSPP/linux/issues/89
>
> Signed-off-by: Azeem Shaikh <azeemshaikh38@gmail.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
--
Kees Cook
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] scsi: bnx2i: Replace all non-returning strlcpy with strscpy
2023-05-17 14:31 [PATCH] scsi: bnx2i: Replace all non-returning strlcpy with strscpy Azeem Shaikh
2023-05-17 19:13 ` Kees Cook
@ 2023-05-22 19:39 ` Kees Cook
1 sibling, 0 replies; 3+ messages in thread
From: Kees Cook @ 2023-05-22 19:39 UTC (permalink / raw)
To: njavali, mrangankar, GR-QLogic-Storage-Upstream, azeemshaikh38
Cc: Kees Cook, martin.petersen, linux-scsi, linux-kernel, jejb,
linux-hardening
On Wed, 17 May 2023 14:31:30 +0000, Azeem Shaikh wrote:
> strlcpy() reads the entire source buffer first.
> This read may exceed the destination size limit.
> This is both inefficient and can lead to linear read
> overflows if a source string is not NUL-terminated [1].
> In an effort to remove strlcpy() completely [2], replace
> strlcpy() here with strscpy().
> No return values were used, so direct replacement is safe.
>
> [...]
Applied to for-next/hardening, thanks!
[1/1] scsi: bnx2i: Replace all non-returning strlcpy with strscpy
https://git.kernel.org/kees/c/91f1887a1420
--
Kees Cook
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-05-22 19:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-17 14:31 [PATCH] scsi: bnx2i: Replace all non-returning strlcpy with strscpy Azeem Shaikh
2023-05-17 19:13 ` Kees Cook
2023-05-22 19:39 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox