Skip to content

Commit 31ca7e7

Browse files
JustinStittkees
authored andcommitted
reiserfs: replace deprecated strncpy with scnprintf
strncpy() is deprecated for use on NUL-terminated destination strings [1] and as such we should prefer more robust and less ambiguous string interfaces. Our goal here is to get @namebuf populated with @name's contents but surrounded with quotes. There is some careful handling done to ensure we properly truncate @name so that we have room for a literal quote as well as a NUL-term. All this careful handling can be done with scnprintf using the dynamic string width specifier %.*s which allows us to pass in the max size for a source string. Doing this, we can put literal quotes in our format specifier and ensure @name is truncated to fit inbetween these quotes (-3 is from 2 quotes + 1 NUL-byte). All in all, we get to remove a deprecated use of strncpy and clean up this code nicely! 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.en.html [2] Link: KSPP#90 Cc: <[email protected]> Signed-off-by: Justin Stitt <[email protected]> Reviewed-by: Kees Cook <[email protected]> Link: https://lore.kernel.org/r/20240328-strncpy-fs-reiserfs-item_ops-c-v1-1-2dab6d22a996@google.com Signed-off-by: Kees Cook <[email protected]>
1 parent 61af39e commit 31ca7e7

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

fs/reiserfs/item_ops.c

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -389,16 +389,9 @@ static void direntry_print_item(struct item_head *ih, char *item)
389389
name = item + deh_location(deh);
390390
if (name[namelen - 1] == 0)
391391
namelen = strlen(name);
392-
namebuf[0] = '"';
393-
if (namelen > sizeof(namebuf) - 3) {
394-
strncpy(namebuf + 1, name, sizeof(namebuf) - 3);
395-
namebuf[sizeof(namebuf) - 2] = '"';
396-
namebuf[sizeof(namebuf) - 1] = 0;
397-
} else {
398-
memcpy(namebuf + 1, name, namelen);
399-
namebuf[namelen + 1] = '"';
400-
namebuf[namelen + 2] = 0;
401-
}
392+
393+
scnprintf(namebuf, sizeof(namebuf), "\"%.*s\"",
394+
(int)sizeof(namebuf)-3, name);
402395

403396
printk("%d: %-15s%-15d%-15d%-15lld%-15lld(%s)\n",
404397
i, namebuf,

0 commit comments

Comments
 (0)