From: Greg Kroah-Hartman Date: Thu, 15 Jun 2017 15:05:28 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v4.9.33~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e77c92337be01a494b3a74dce67d3f1733f27c8a;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: sparc64-make-string-buffers-large-enough.patch --- diff --git a/queue-4.9/series b/queue-4.9/series index b18d06a3e34..76ae24dc222 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -105,3 +105,4 @@ xtensa-don-t-use-linux-irq-0.patch s390-kvm-do-not-rely-on-the-ilc-on-kvm-host-protection-fauls.patch drm-i915-workaround-vlv-chv-dsi-scanline-counter-hardware-fail.patch drm-i915-always-recompute-watermarks-when-distrust_bios_wm-is-set-v2.patch +sparc64-make-string-buffers-large-enough.patch diff --git a/queue-4.9/sparc64-make-string-buffers-large-enough.patch b/queue-4.9/sparc64-make-string-buffers-large-enough.patch new file mode 100644 index 00000000000..85a86ddcbec --- /dev/null +++ b/queue-4.9/sparc64-make-string-buffers-large-enough.patch @@ -0,0 +1,42 @@ +From b5c3206190f1fddd100b3060eb15f0d775ffeab8 Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +Date: Fri, 25 Nov 2016 14:03:55 +0300 +Subject: sparc64: make string buffers large enough + +From: Dan Carpenter + +commit b5c3206190f1fddd100b3060eb15f0d775ffeab8 upstream. + +My static checker complains that if "lvl" is ULONG_MAX (this is 64 bit) +then some of the strings will overflow. I don't know if that's possible +but it seems simple enough to make the buffers slightly larger. + +Signed-off-by: Dan Carpenter +Signed-off-by: David S. Miller +Cc: Waldemar Brodkorb +Signed-off-by: Greg Kroah-Hartman + +--- + arch/sparc/kernel/traps_64.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/arch/sparc/kernel/traps_64.c ++++ b/arch/sparc/kernel/traps_64.c +@@ -85,7 +85,7 @@ static void dump_tl1_traplog(struct tl1_ + + void bad_trap(struct pt_regs *regs, long lvl) + { +- char buffer[32]; ++ char buffer[36]; + siginfo_t info; + + if (notify_die(DIE_TRAP, "bad trap", regs, +@@ -116,7 +116,7 @@ void bad_trap(struct pt_regs *regs, long + + void bad_trap_tl1(struct pt_regs *regs, long lvl) + { +- char buffer[32]; ++ char buffer[36]; + + if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs, + 0, lvl, SIGTRAP) == NOTIFY_STOP)