OSDN Git Service

scsi: aacraid: Replace all non-returning strlcpy with strscpy
authorAzeem Shaikh <azeemshaikh38@gmail.com>
Wed, 17 May 2023 14:30:49 +0000 (14:30 +0000)
committerKees Cook <keescook@chromium.org>
Fri, 26 May 2023 20:52:19 +0000 (13:52 -0700)
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>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20230517143049.1519806-1-azeemshaikh38@gmail.com
drivers/scsi/aacraid/aachba.c

index 24c049e..70e1cac 100644 (file)
@@ -3289,7 +3289,7 @@ static int query_disk(struct aac_dev *dev, void __user *arg)
        else
                qd.unmapped = 0;
 
-       strlcpy(qd.name, fsa_dev_ptr[qd.cnum].devname,
+       strscpy(qd.name, fsa_dev_ptr[qd.cnum].devname,
          min(sizeof(qd.name), sizeof(fsa_dev_ptr[qd.cnum].devname) + 1));
 
        if (copy_to_user(arg, &qd, sizeof (struct aac_query_disk)))