Skip to content

Commit ae82eaf

Browse files
igawmartinkpetersen
authored andcommitted
scsi: lpfc: Use memcpy() for BIOS version
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. Anyway, instead of 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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Justin Tee <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent cdcb08d commit ae82eaf

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/scsi/lpfc/lpfc_sli.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6003,9 +6003,9 @@ lpfc_sli4_get_ctl_attr(struct lpfc_hba *phba)
60036003
phba->sli4_hba.flash_id = bf_get(lpfc_cntl_attr_flash_id, cntl_attr);
60046004
phba->sli4_hba.asic_rev = bf_get(lpfc_cntl_attr_asic_rev, cntl_attr);
60056005

6006-
memset(phba->BIOSVersion, 0, sizeof(phba->BIOSVersion));
6007-
strlcat(phba->BIOSVersion, (char *)cntl_attr->bios_ver_str,
6006+
memcpy(phba->BIOSVersion, cntl_attr->bios_ver_str,
60086007
sizeof(phba->BIOSVersion));
6008+
phba->BIOSVersion[sizeof(phba->BIOSVersion) - 1] = '\0';
60096009

60106010
lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
60116011
"3086 lnk_type:%d, lnk_numb:%d, bios_ver:%s, "

0 commit comments

Comments
 (0)