]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
mm/thp: fix strncpy warning
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Thu, 1 Jul 2021 01:52:11 +0000 (18:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Jul 2021 03:47:30 +0000 (20:47 -0700)
Using MAX_INPUT_BUF_SZ as the maximum length of the string makes fortify
complain as it thinks the string might be longer than the buffer, and if
it is, we will end up with a "string" that is missing a NUL terminator.
It's trivial to show that 'tok' points to a NUL-terminated string which is
less than MAX_INPUT_BUF_SZ in length, so we may as well just use strcpy()
and avoid the warning.

Link: https://lkml.kernel.org/r/20210615200242.1716568-4-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/huge_memory.c

index 503c8e1aecc6bda55a64d45cddaaffb2b2b230eb..d513b0cd1161d97acfb33b5f56d862936e2eb95e 100644 (file)
@@ -3101,7 +3101,7 @@ static ssize_t split_huge_pages_write(struct file *file, const char __user *buf,
 
                tok = strsep(&buf, ",");
                if (tok) {
-                       strncpy(file_path, tok, MAX_INPUT_BUF_SZ);
+                       strcpy(file_path, tok);
                } else {
                        ret = -EINVAL;
                        goto out;