PM: hibernate: replace deprecated strncpy() with strscpy()
authorJustin Stitt <justinstitt@google.com>
Mon, 29 Apr 2024 20:50:30 +0000 (20:50 +0000)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 30 Apr 2024 10:59:30 +0000 (12:59 +0200)
strncpy() is deprecated for use on NUL-terminated destination strings
[1] and as such we should prefer more robust and less ambiguous string
interfaces.

This kernel config option is simply assigned with the resume_file
buffer. It should be NUL-terminated but not necessarily NUL-padded as
per its further usage with other string apis:
| static int __init find_resume_device(void)
| {
| if (!strlen(resume_file))
| return -ENOENT;
|
| pm_pr_dbg("Checking hibernation image partition %s\n", resume_file);

Use strscpy() [2] as it guarantees NUL-termination on the destination
buffer. Specifically, use 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
Signed-off-by: Justin Stitt <justinstitt@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Dhruva Gole <d-gole@ti.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
kernel/power/hibernate.c

index 43b1a82e800c975a2de1e344ade85c3506c8b614..0a213f69a9e4ac0be17020ffb18d7456b7105762 100644 (file)
@@ -1361,7 +1361,7 @@ static int __init resume_setup(char *str)
        if (noresume)
                return 1;
 
-       strncpy(resume_file, str, 255);
+       strscpy(resume_file, str);
        return 1;
 }