Commit a19428e5 authored Jan 27, 2014 by Chen Gang Committed by Linus Torvalds Jan 27, 2014

kernel/kexec.c: use vscnprintf() instead of vsnprintf() in vmcoreinfo_append_str()

vsnprintf() may let 'r' larger than sizeof(buf), in this case, if 'r' is
also less than "vmcoreinfo_max_size - vmcoreinfo_size" (left size of
destination buffer), next memcpy() will read the unexpected addresses.

Signed-off-by: Chen Gang <gang.chen@asianux.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 53e0ee9f

kernel/kexec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1537,7 +1537,7 @@ void vmcoreinfo_append_str(const char *fmt, ...)
		size_t r;

		va_start(args, fmt);
		r = vsnprintf(buf, sizeof(buf), fmt, args);
		r = vscnprintf(buf, sizeof(buf), fmt, args);
		va_end(args);

		r = min(r, vmcoreinfo_max_size - vmcoreinfo_size);