scsi: lpfc: Avoid -Wstringop-overflow warning
Subsystems (2)
PATCH v2 1/1 scsi: lpfc: Avoid -Wstringop-overflow warning
Prevent any potential integer wrapping issue, and avoid a -Wstringop-overflow warning by using the check_mul_overflow() helper.
drivers/scsi/lpfc/lpfc.h:
837:#define LPFC_RAS_MIN_BUFF_POST_SIZE (256 * 1024)
drivers/scsi/lpfc/lpfc_debugfs.c:
2266 size = LPFC_RAS_MIN_BUFF_POST_SIZE * phba->cfg_ras_fwlog_buffsize;
this can wrap to negative if cfg_ras_fwlog_buffsize is large enough. And even when in practice this is not possible (due to phba->cfg_ras_fwlog_buffsize never being larger than 4[1]), the compiler is legitimately warning us about potentially buggy code.
Fix the following warning seen under GCC-13:
In function ‘lpfc_debugfs_ras_log_data’,
inlined from ‘lpfc_debugfs_ras_log_open’ at drivers/scsi/lpfc/lpfc_debugfs.c:2271:15:drivers/scsi/lpfc/lpfc_debugfs.c:2210:25: warning: ‘memcpy’ specified bound between 18446744071562067968 and 18446744073709551615 exceeds maximum object size 9223372036854775807 [-Wstringop-overflow=]
2210 | memcpy(buffer + copied, dmabuf->virt,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2211 | size - copied - 1);
| ~~~~~~~~~~~~~~~~~~---
Changes in v2:
- Use check_mul_overflow() helper (Kees).
v1:
- Link: https://lore.kernel.org/linux-hardening/ZHZq7AV9Q2WG1xRB@work/
drivers/scsi/lpfc/lpfc_debugfs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/scsi/lpfc/lpfc_debugfs.c +6 -2
@@ -2259,11 +2259,15 @@ lpfc_debugfs_ras_log_open(struct inode *inode, struct file *file) goto out; }spin_unlock_irq (&phba->hbalock); - debug =kmalloc (sizeof (*debug),GFP_KERNEL ); + +if (check_mul_overflow (LPFC_RAS_MIN_BUFF_POST_SIZE , + phba->cfg_ras_fwlog_buffsize, &size)) + goto out; + + debug =kzalloc (sizeof (*debug),GFP_KERNEL );if (!debug) goto out; - size =LPFC_RAS_MIN_BUFF_POST_SIZE * phba->cfg_ras_fwlog_buffsize; debug->buffer =vmalloc (size);if (!debug->buffer) goto free_debug;
Signature · 1 line
2.34.1
Thanks Gustavo and Kees.
Quoted 64 lines · Gustavo A. R. Silva
Prevent any potential integer wrapping issue, and avoid a -Wstringop-overflow warning by using the
check_mul_overflow()helper.
drivers/scsi/lpfc/lpfc.h:
837:#defineLPFC_RAS_MIN_BUFF_POST_SIZE(256 * 1024)
drivers/scsi/lpfc/lpfc_debugfs.c:
2266 size =LPFC_RAS_MIN_BUFF_POST_SIZE*phba->cfg_ras_fwlog_buffsize;this can wrap to negative if
cfg_ras_fwlog_buffsizeis large enough. And even when in practice this is not possible (due tophba->cfg_ras_fwlog_buffsizenever being larger than 4[1]), the compiler is legitimately warning us about potentially buggy code.Fix the following warning seen under GCC-13:
In function ‘lpfc_debugfs_ras_log_data’,
inlined from ‘lpfc_debugfs_ras_log_open’ atdrivers/scsi/lpfc/lpfc_debugfs.c:2271:15:drivers/scsi/lpfc/lpfc_debugfs.c:2210:25: warning: ‘memcpy’ specified bound between 18446744071562067968 and 18446744073709551615 exceeds maximum object size 9223372036854775807 [-Wstringop-overflow=]2210 | memcpy(buffer + copied, dmabuf->virt, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 2211 | size - copied - 1); | ~~~~~~~~~~~~~~~~~~Link https://lore.kernel.org/linux-hardening/CABPRKS8zyzrbsWt4B5fp7kMowAZFiMLKg5kW26uELpg1cDKY3A@mail.gmail.com/ [1] open hereCo-developed-by Kees Cook <[email protected]>Signed-off-by Kees Cook <[email protected]>Signed-off-by Gustavo A. R. Silva <[email protected]>---
Changes in v2:
- Usecheck_mul_overflow()helper (Kees).v1:
- Link: https://lore.kernel.org/linux-hardening/ZHZq7AV9Q2WG1xRB@work/drivers/scsi/lpfc/lpfc_debugfs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/scsi/lpfc/lpfc_debugfs.c +6
-3@@ -2259,11 +2259,15 @@ lpfc_debugfs_ras_log_open(struct inode *inode, struct file *file) goto out; }spin_unlock_irq (&phba->hbalock); - debug =kmalloc (sizeof (*debug),GFP_KERNEL ); + +if (check_mul_overflow (LPFC_RAS_MIN_BUFF_POST_SIZE , + phba->cfg_ras_fwlog_buffsize, &size)) + goto out; + + debug =kzalloc (sizeof (*debug),GFP_KERNEL );if (!debug) goto out; - size =LPFC_RAS_MIN_BUFF_POST_SIZE * phba->cfg_ras_fwlog_buffsize; debug->buffer =vmalloc (size);if (!debug->buffer) goto free_debug; --2.34.1
Martin K. Petersen
AppliedGustavo,
Quoted 2 lines
Prevent any potential integer wrapping issue, and avoid a -Wstringop-overflow warning by using the
check_mul_overflow()helper.
Applied to 6.5/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 10 lines · Gustavo A. R. Silva
Prevent any potential integer wrapping issue, and avoid a -Wstringop-overflow warning by using the
check_mul_overflow()helper.
drivers/scsi/lpfc/lpfc.h:
837:#defineLPFC_RAS_MIN_BUFF_POST_SIZE(256 * 1024)
drivers/scsi/lpfc/lpfc_debugfs.c:
2266 size =LPFC_RAS_MIN_BUFF_POST_SIZE*phba->cfg_ras_fwlog_buffsize;[...]
Applied to 6.5/scsi-queue, thanks!
[1/1] scsi: lpfc: Avoid -Wstringop-overflow warning
https://git.kernel.org/mkp/scsi/c/a48e2c328c65
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering