vmcore: replace strncpy with strscpy_pad
authorJustin Stitt <justinstitt@google.com>
Mon, 1 Apr 2024 18:39:55 +0000 (18:39 +0000)
committerAndrew Morton <akpm@linux-foundation.org>
Fri, 26 Apr 2024 04:07:06 +0000 (21:07 -0700)
strncpy() is in the process of being replaced as it is deprecated [1].
We should move towards safer and less ambiguous string interfaces.

Looking at vmcoredd_header's definition:
| struct vmcoredd_header {
| __u32 n_namesz; /* Name size */
| __u32 n_descsz; /* Content size */
| __u32 n_type;   /* NT_VMCOREDD */
| __u8 name[8];   /* LINUX\0\0\0 */
| __u8 dump_name[VMCOREDD_MAX_NAME_BYTES]; /* Device dump's name */
| };
.. we see that @name wants to be NUL-padded.

We're copying data->dump_name which is defined as:
| char dump_name[VMCOREDD_MAX_NAME_BYTES]; /* Unique name of the dump */
.. which shares the same size as vdd_hdr->dump_name. Let's make sure we
NUL-pad this as well.

Use strscpy_pad() which NUL-terminates and NUL-pads its destination
buffers. Specifically, use the new 2-argument version of strscpy_pad
introduced in Commit e6584c3964f2f ("string: Allow 2-argument
strscpy()").

Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings
Link: https://github.com/KSPP/linux/issues/90
Link: https://lkml.kernel.org/r/20240401-strncpy-fs-proc-vmcore-c-v2-1-dd0a73f42635@google.com
Signed-off-by: Justin Stitt <justinstitt@google.com>
Acked-by: Baoquan He <bhe@redhat.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
fs/proc/vmcore.c

index 1fb213f379a5b6bdaa296086d75c23447032e759..5d08d4d159d30be0363e47b5ee2d259bee0a51cd 100644 (file)
@@ -1370,9 +1370,8 @@ static void vmcoredd_write_header(void *buf, struct vmcoredd_data *data,
        vdd_hdr->n_descsz = size + sizeof(vdd_hdr->dump_name);
        vdd_hdr->n_type = NT_VMCOREDD;
 
-       strncpy((char *)vdd_hdr->name, VMCOREDD_NOTE_NAME,
-               sizeof(vdd_hdr->name));
-       memcpy(vdd_hdr->dump_name, data->dump_name, sizeof(vdd_hdr->dump_name));
+       strscpy_pad(vdd_hdr->name, VMCOREDD_NOTE_NAME);
+       strscpy_pad(vdd_hdr->dump_name, data->dump_name);
 }
 
 /**