seq_file: seq_show_option_n() is used for precise sizes
PATCH 1/1 seq_file: seq_show_option_n() is used for precise sizes
When seq_show_option_n() is used, it is for non-string memory that happens to be printable bytes. As such, we must use memcpy() to copy the bytes and then explicitly NUL-terminate the result.
Cc Andy Shevchenko <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Al Viro <[email protected]>
Cc Muchun Song <[email protected]>
Signed-off-by Kees Cook <[email protected]>
--- include/linux/seq_file.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
include/linux/seq_file.h +4 -3
@@ -249,18 +249,19 @@ static inline void seq_show_option(struct seq_file *m, const char *name,/** * seq_show_option_n - display mount options with appropriate escapes -* where @value must be a specific length. +* where @value must be a specific length (i.e. +* not NUL-terminated). * @m: the seq_file handle * @name: the mount option name * @value: the mount option name's value, cannot be NULL -* @length: the length of @value to display +* @length: the exact length of @value to display, must be constant expression * * This is a macro since this uses "length" to define the size of the * stack buffer. */ #define seq_show_option_n (m, name, value, length) { \ char val_buf[length + 1]; \ - strncpy(val_buf, value, length); \ + memcpy(val_buf, value, length); \ val_buf[length] = '\0'; \ seq_show_option(m, name, val_buf); \ }
Signature · 1 line
2.34.1
Quoted 3 lines · Kees Cook
When
seq_show_option_n()is used, it is for non-string memory that happens to be printable bytes. As such, we must usememcpy()to copy the bytes and then explicitly NUL-terminate the result.
FWIW,
Reviewed-by Andy Shevchenko <[email protected]>
Quoted 39 lines
Cc Andy Shevchenko <[email protected]>Cc Andrew Morton <[email protected]>Cc Al Viro <[email protected]>Cc Muchun Song <[email protected]>Signed-off-by Kees Cook <[email protected]>--- include/linux/seq_file.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)include/linux/seq_file.h +4
-3@@ -249,18 +249,19 @@ static inline void seq_show_option(struct seq_file *m, const char *name,/** * seq_show_option_n - display mount options with appropriate escapes -* where @value must be a specific length. +* where @value must be a specific length (i.e. +* not NUL-terminated). * @m: the seq_file handle * @name: the mount option name * @value: the mount option name's value, cannot be NULL -* @length: the length of @value to display +* @length: the exact length of @value to display, must be constant expression * * This is a macro since this uses "length" to define the size of the * stack buffer. */ #define seq_show_option_n (m, name, value, length) { \ char val_buf[length + 1]; \ - strncpy(val_buf, value, length); \ + memcpy(val_buf, value, length); \ val_buf[length] = '\0'; \ seq_show_option(m, name, val_buf); \ }Signature · 1 line
2.34.1
Signature · 2 lines
With Best Regards, Andy Shevchenko
Kees Cook
AppliedQuoted 5 lines · Kees Cook
When
seq_show_option_n()is used, it is for non-string memory that happens to be printable bytes. As such, we must usememcpy()to copy the bytes and then explicitly NUL-terminate the result.
Applied, thanks!
[1/1] seq_file: seq_show_option_n() is used for precise sizes
https://git.kernel.org/kees/c/630fdd592912
Best regards,
Signature · 1 line
Kees Cook