kevin/linux
1
Fork 0
Code

scsi: message: fusion: Replace all non-returning strlcpy() with strscpy()

Browse Source 
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>
Link: https://lore.kernel.org/r/20230530160248.411637-1-azeemshaikh38@gmail.com
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Azeem Shaikh 2023-05-30 16:02:48 +00:00 committed by Martin K. Petersen
parent 4dae0262fb
commit dbe37c71d1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/message/fusion/mptbase.c
View File

@ -712,7 +712,7 @@ mpt_register(MPT_CALLBACK cbfunc, MPT_DRIVER_CLASS dclass, char *func_name)
MptDriverClass[cb_idx] = dclass; MptDriverClass[cb_idx] = dclass;
MptEvHandlers[cb_idx] = NULL; MptEvHandlers[cb_idx] = NULL;
last_drv_idx = cb_idx; last_drv_idx = cb_idx;
strlcpy(MptCallbacksName[cb_idx], func_name, strscpy(MptCallbacksName[cb_idx], func_name,
MPT_MAX_CALLBACKNAME_LEN+1); MPT_MAX_CALLBACKNAME_LEN+1);
break; break;
} }
@ -7666,7 +7666,7 @@ mpt_display_event_info(MPT_ADAPTER *ioc, EventNotificationReply_t *pEventReply)
break; break;
} }
if (ds) if (ds)
strlcpy(evStr, ds, EVENT_DESCR_STR_SZ); strscpy(evStr, ds, EVENT_DESCR_STR_SZ);
devtprintk(ioc, printk(MYIOC_s_DEBUG_FMT devtprintk(ioc, printk(MYIOC_s_DEBUG_FMT

2
drivers/message/fusion/mptctl.c
View File

@ -2408,7 +2408,7 @@ mptctl_hp_hostinfo(MPT_ADAPTER *ioc, unsigned long arg, unsigned int data_size)
if (mpt_config(ioc, &cfg) == 0) { if (mpt_config(ioc, &cfg) == 0) {
ManufacturingPage0_t *pdata = (ManufacturingPage0_t *) pbuf; ManufacturingPage0_t *pdata = (ManufacturingPage0_t *) pbuf;
if (strlen(pdata->BoardTracerNumber) > 1) { if (strlen(pdata->BoardTracerNumber) > 1) {
strlcpy(karg.serial_number, strscpy(karg.serial_number,
pdata->BoardTracerNumber, 24); pdata->BoardTracerNumber, 24);
} }
} }