Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

scsi: mptfusion: Avoid possible run-time warning with long manufacturer strings

The prior strscpy() replacement of strncpy() here expected the
manufacture_reply strings to be NUL-terminated, but it is possible
they are not, as the code pattern here shows, e.g., edev->vendor_id
being exactly 1 character larger than manufacture_reply->vendor_id,
and the replaced strncpy() was copying only up to the size of the
source character array. Replace this with memtostr(), which is the
unambiguous way to convert a maybe not-NUL-terminated character array
into a NUL-terminated string.

Reported-by: Charles Bertsch <cbertsch@cox.net>
Closes: https://lore.kernel.org/all/5445ba0f-3e27-4d43-a9ba-0cc22ada2fce@cox.net/
Fixes: 45e833f0e5bb ("scsi: message: fusion: Replace deprecated strncpy() with strscpy()")
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20240410023155.2100422-2-keescook@chromium.org
Signed-off-by: Kees Cook <keescook@chromium.org>

+5 -9
+5 -9
drivers/message/fusion/mptsas.c
··· 2964 2964 goto out_free; 2965 2965 2966 2966 manufacture_reply = data_out + sizeof(struct rep_manu_request); 2967 - strscpy(edev->vendor_id, manufacture_reply->vendor_id, 2968 - sizeof(edev->vendor_id)); 2969 - strscpy(edev->product_id, manufacture_reply->product_id, 2970 - sizeof(edev->product_id)); 2971 - strscpy(edev->product_rev, manufacture_reply->product_rev, 2972 - sizeof(edev->product_rev)); 2967 + memtostr(edev->vendor_id, manufacture_reply->vendor_id); 2968 + memtostr(edev->product_id, manufacture_reply->product_id); 2969 + memtostr(edev->product_rev, manufacture_reply->product_rev); 2973 2970 edev->level = manufacture_reply->sas_format; 2974 2971 if (manufacture_reply->sas_format) { 2975 - strscpy(edev->component_vendor_id, 2976 - manufacture_reply->component_vendor_id, 2977 - sizeof(edev->component_vendor_id)); 2972 + memtostr(edev->component_vendor_id, 2973 + manufacture_reply->component_vendor_id); 2978 2974 tmp = (u8 *)&manufacture_reply->component_id; 2979 2975 edev->component_id = tmp[0] << 8 | tmp[1]; 2980 2976 edev->component_revision_id =