Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 20:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/vsprintf.c: eliminate potential race in string()

Browse Source 
If the string corresponding to a %s specifier can change under us, we
might end up copying a \0 byte to the output buffer.  There might be
callers who expect the output buffer to contain a genuine C string whose
length is exactly the snprintf return value (assuming truncation hasn't
happened or has been checked for).

We can avoid this by only passing over the source string once, stopping
the first time we meet a nul byte (or when we reach the given
precision), and then letting widen_string() handle left/right space
padding.  As a small bonus, this code reuse also makes the generated
code slightly smaller.

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Joe Perches <joe@perches.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Maurizio Lombardi <mlombard@redhat.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Rasmus Villemoes 2016-01-15 16:58:34 -08:00 committed by Linus Torvalds
parent 95508cfa10
commit 34fc8b9076
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/vsprintf.c
View File

@ -560,32 +560,22 @@ char *widen_string(char *buf, int n, char *end, struct printf_spec spec)
static noinline_for_stack static noinline_for_stack
char *string(char *buf, char *end, const char *s, struct printf_spec spec) char *string(char *buf, char *end, const char *s, struct printf_spec spec)
{ {
int len, i; int len = 0;
size_t lim = spec.precision;
if ((unsigned long)s < PAGE_SIZE) if ((unsigned long)s < PAGE_SIZE)
s = "(null)"; s = "(null)";
len = strnlen(s, spec.precision); while (lim--) {
char c = *s++;
if (!(spec.flags & LEFT)) { if (!c)
while (len < spec.field_width--) { break;
if (buf < end)
*buf = ' ';
++buf;
}
}
for (i = 0; i < len; ++i) {
if (buf < end) if (buf < end)
*buf = *s; *buf = c;
++buf; ++s;
}
while (len < spec.field_width--) {
if (buf < end)
*buf = ' ';
++buf; ++buf;
++len;
} }
return widen_string(buf, len, end, spec);
return buf;
} }
static noinline_for_stack static noinline_for_stack