powerpc/ps3: refactor strncpy usage
authorJustin Stitt <justinstitt@google.com>
Wed, 16 Aug 2023 21:39:24 +0000 (21:39 +0000)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 18 Aug 2023 01:48:42 +0000 (11:48 +1000)
`strncpy` is deprecated for use on NUL-terminated destination strings [1].

`make_first_field()` should use similar implementation to `make_field()`
due to memcpy having more obvious behavior here. The end result yields
the same behavior as the previous `strncpy`-based implementation
including the NUL-padding.

Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings
Link: https://github.com/KSPP/linux/issues/90
Signed-off-by: Justin Stitt <justinstitt@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Tested-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230816-strncpy-arch-powerpc-platforms-ps3-repository-v1-1-88283b02fb09@google.com
arch/powerpc/platforms/ps3/repository.c

index 2057630..1abe33f 100644 (file)
@@ -73,9 +73,9 @@ static void _dump_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4,
 
 static u64 make_first_field(const char *text, u64 index)
 {
-       u64 n;
+       u64 n = 0;
 
-       strncpy((char *)&n, text, 8);
+       memcpy((char *)&n, text, strnlen(text, sizeof(n)));
        return PS3_VENDOR_ID_NONE + (n >> 32) + index;
 }