]> www.infradead.org Git - users/jedix/linux-maple.git/commit
pstore/blk: replace deprecated strncpy with strscpy
authorJustin Stitt <justinstitt@google.com>
Thu, 28 Mar 2024 20:54:16 +0000 (20:54 +0000)
committerKees Cook <keescook@chromium.org>
Thu, 11 Apr 2024 16:37:26 +0000 (09:37 -0700)
commit9dd12ed95c2d06a29a5d289c6e65589c577ef8ca
treeb55d362a3f4780867c2042a8b8fd8d531a05a890
parent39cd87c4eb2b893354f3b850f916353f2658ae6f
pstore/blk: replace deprecated strncpy with strscpy

strncpy() is deprecated for use on NUL-terminated destination strings
[1] and as such we should prefer more robust and less ambiguous string
interfaces.

We know that info-device should be NUL-terminated based on its use with
strlen():
| static int __init mtdpstore_init(void)
| {
| int ret;
| struct mtdpstore_context *cxt = &oops_cxt;
| struct pstore_blk_config *info = &cxt->info;
|
| ret = pstore_blk_get_config(info);
| if (unlikely(ret))
| return ret;
|
| if (strlen(info->device) == 0) {
| pr_err("mtd device must be supplied (device name is empty)\n");
...

Considering the above, a suitable replacement is `strscpy` [2] due to
the fact that it guarantees NUL-termination on the destination buffer.

Note that this patch relies on the _new_ 2-argument version of strscpy()
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://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html
Link: https://github.com/KSPP/linux/issues/90
Cc: <linux-hardening@vger.kernel.org>
Signed-off-by: Justin Stitt <justinstitt@google.com>
Link: https://lore.kernel.org/r/20240328-strncpy-fs-pstore-blk-c-v1-1-5748cdc22a53@google.com
Signed-off-by: Kees Cook <keescook@chromium.org>
fs/pstore/blk.c