scsi: message: fusion: Replace all non-returning strlcpy with strscpy
Subsystems (2)
PATCH 1/1 scsi: message: fusion: Replace all non-returning strlcpy with strscpy
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
--- drivers/message/fusion/mptbase.c | 4 ++-- drivers/message/fusion/mptctl.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/message/fusion/mptbase.c +2 -2
@@ -712,7 +712,7 @@ mpt_register(MPT_CALLBACK cbfunc, MPT_DRIVER_CLASS dclass, char *func_name) MptDriverClass[cb_idx] = dclass; MptEvHandlers[cb_idx] =NULL ; last_drv_idx = cb_idx; -strlcpy (MptCallbacksName[cb_idx], func_name, +strscpy (MptCallbacksName[cb_idx], func_name,MPT_MAX_CALLBACKNAME_LEN +1 );break ; }
@@ -7666,7 +7666,7 @@ mpt_display_event_info(MPT_ADAPTER *ioc, EventNotificationReply_t *pEventReply)break ; }if (ds) -strlcpy (evStr, ds,EVENT_DESCR_STR_SZ ); +strscpy (evStr, ds,EVENT_DESCR_STR_SZ ); devtprintk(ioc, printk(MYIOC_s_DEBUG_FMT
drivers/message/fusion/mptctl.c +1 -1
@@ -2408,7 +2408,7 @@ mptctl_hp_hostinfo(MPT_ADAPTER *ioc, unsigned long arg, unsigned int data_size)if (mpt_config (ioc, &cfg) ==0 ) {ManufacturingPage0_t *pdata = (ManufacturingPage0_t *) pbuf;if (strlen (pdata->BoardTracerNumber) >1 ) { -strlcpy (karg.serial_number, +strscpy (karg.serial_number, pdata->BoardTracerNumber,24 ); } }
Quoted 8 lines · Azeem Shaikh
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 removestrlcpy()completely [2], replacestrlcpy()here withstrscpy().
No return values were used, so direct replacement is safe.
Quoted 4 lines
[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89Signed-off-by Azeem Shaikh <[email protected]>
Signature · 1 line
Kees Cook
Martin K. Petersen
AppliedAzeem,
Quoted 6 lines
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 removestrlcpy()completely [2], replacestrlcpy()here withstrscpy(). No return values were used, so direct replacement is safe.
Applied to 6.5/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 9 lines · Azeem Shaikh
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 removestrlcpy()completely [2], replacestrlcpy()here withstrscpy().
No return values were used, so direct replacement is safe.[...]
Applied to 6.5/scsi-queue, thanks!
[1/1] scsi: message: fusion: Replace all non-returning strlcpy with strscpy
https://git.kernel.org/mkp/scsi/c/dbe37c71d124
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering