Re: [PATCH] PM: hibernate: replace deprecated strncpy with strscpy

From: Rafael J. Wysocki
Date: Tue Apr 30 2024 - 07:01:41 EST


On Tue, Apr 30, 2024 at 11:36 AM Dhruva Gole <d-gole@xxxxxx> wrote:
>
> On Apr 29, 2024 at 20:50:30 +0000, Justin Stitt wrote:
> > 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 [1]
> > Link: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.enhtml [2]
> > Link: https://github.com/KSPP/linux/issues/90
> > Cc: linux-hardening@xxxxxxxxxxxxxxx
> > Signed-off-by: Justin Stitt <justinstitt@xxxxxxxxxx>
> > ---
> [...]
>
> Reviewed-by: Dhruva Gole <d-gole@xxxxxx>

Applied as 6.10 material, thanks!