From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 15 Jun 2017 15:04:56 +0000 (+0200)
Subject: 3.18-stable patches
X-Git-Tag: v4.9.33~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b293e9020abb537245106fa3e2e46edb7a8c26a;p=thirdparty%2Fkernel%2Fstable-queue.git

3.18-stable patches

added patches:
	sparc64-make-string-buffers-large-enough.patch
---

diff --git a/queue-3.18/series b/queue-3.18/series
index 6105826d887..d6b5f7afe74 100644
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -6,3 +6,4 @@ net-xilinx_emaclite-fix-receive-buffer-overflow.patch
 ipv6-handle-ipv4-mapped-src-to-in6addr_any-dst.patch
 ipv6-inhibit-ipv4-mapped-src-address-on-the-wire.patch
 log2-make-order_base_2-behave-correctly-on-const-input-value-zero.patch
+sparc64-make-string-buffers-large-enough.patch
diff --git a/queue-3.18/sparc64-make-string-buffers-large-enough.patch b/queue-3.18/sparc64-make-string-buffers-large-enough.patch
new file mode 100644
index 00000000000..85a86ddcbec
--- /dev/null
+++ b/queue-3.18/sparc64-make-string-buffers-large-enough.patch
@@ -0,0 +1,42 @@
+From b5c3206190f1fddd100b3060eb15f0d775ffeab8 Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Fri, 25 Nov 2016 14:03:55 +0300
+Subject: sparc64: make string buffers large enough
+
+From: Dan Carpenter <dan.carpenter@oracle.com>
+
+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 <dan.carpenter@oracle.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Cc: Waldemar Brodkorb <wbx@openadk.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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)