]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
scsi: hpsa: Replace deprecated strncpy() with strscpy_pad()
authorThorsten Blum <thorsten.blum@linux.dev>
Thu, 13 Feb 2025 11:40:48 +0000 (12:40 +0100)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 19 Feb 2025 02:34:08 +0000 (21:34 -0500)
strncpy() is deprecated for NUL-terminated destination buffers. Replace
memset() and strncpy() with strscpy_pad() to copy the version string and
fill the remaining bytes in the destination buffer with NUL bytes. This
avoids zeroing the memory before copying the string.

Compile-tested only.

Link: https://github.com/KSPP/linux/issues/90
Cc: linux-hardening@vger.kernel.org
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Link: https://lore.kernel.org/r/20250213114047.2366-2-thorsten.blum@linux.dev
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Kees Cook <kees@kernel.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/hpsa.c

index bb65954b1b1e9e6465e0ffe348fb23caa06248f6..c73a71ac3c2901393826e86c0a53c58600fa86ae 100644 (file)
@@ -7230,8 +7230,7 @@ static int hpsa_controller_hard_reset(struct pci_dev *pdev,
 
 static void init_driver_version(char *driver_version, int len)
 {
-       memset(driver_version, 0, len);
-       strncpy(driver_version, HPSA " " HPSA_DRIVER_VERSION, len - 1);
+       strscpy_pad(driver_version, HPSA " " HPSA_DRIVER_VERSION, len);
 }
 
 static int write_driver_ver_to_cfgtable(struct CfgTable __iomem *cfgtable)