3.18-stable patches

added patches:
	acpi-sbshc-remove-raw-pointer-from-printk-message.patch
	mn10300-misalignment-use-sigsegv-segv_maperr-to-report-a-failed-user-copy.patch

diff --git a/queue-3.18/acpi-sbshc-remove-raw-pointer-from-printk-message.patch b/queue-3.18/acpi-sbshc-remove-raw-pointer-from-printk-message.patch
new file mode 100644 (file)
index 0000000..cefbb11
--- /dev/null
+++ b/queue-3.18/acpi-sbshc-remove-raw-pointer-from-printk-message.patch
@@ -0,0 +1,35 @@
+From 43cdd1b716b26f6af16da4e145b6578f98798bf6 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Fri, 19 Jan 2018 10:06:03 +0100
+Subject: ACPI: sbshc: remove raw pointer from printk() message
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+commit 43cdd1b716b26f6af16da4e145b6578f98798bf6 upstream.
+
+There's no need to be printing a raw kernel pointer to the kernel log at
+every boot.  So just remove it, and change the whole message to use the
+correct dev_info() call at the same time.
+
+Reported-by: Wang Qize <wang_qize@venustech.com.cn>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/acpi/sbshc.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/acpi/sbshc.c
++++ b/drivers/acpi/sbshc.c
+@@ -309,8 +309,8 @@ static int acpi_smbus_hc_add(struct acpi
+       device->driver_data = hc;
+ 
+       acpi_ec_add_query_handler(hc->ec, hc->query_bit, NULL, smbus_alarm, hc);
+-      printk(KERN_INFO PREFIX "SBS HC: EC = 0x%p, offset = 0x%0x, query_bit = 0x%0x\n",
+-              hc->ec, hc->offset, hc->query_bit);
++      dev_info(&device->dev, "SBS HC: offset = 0x%0x, query_bit = 0x%0x\n",
++               hc->offset, hc->query_bit);
+ 
+       return 0;
+ }

diff --git a/queue-3.18/mn10300-misalignment-use-sigsegv-segv_maperr-to-report-a-failed-user-copy.patch b/queue-3.18/mn10300-misalignment-use-sigsegv-segv_maperr-to-report-a-failed-user-copy.patch
new file mode 100644 (file)
index 0000000..9f31e35
--- /dev/null
+++ b/queue-3.18/mn10300-misalignment-use-sigsegv-segv_maperr-to-report-a-failed-user-copy.patch
@@ -0,0 +1,37 @@
+From 6ac1dc736b323011a55ecd1fc5897c24c4f77cbd Mon Sep 17 00:00:00 2001
+From: "Eric W. Biederman" <ebiederm@xmission.com>
+Date: Tue, 1 Aug 2017 05:02:38 -0500
+Subject: mn10300/misalignment: Use SIGSEGV SEGV_MAPERR to report a failed user copy
+
+From: Eric W. Biederman <ebiederm@xmission.com>
+
+commit 6ac1dc736b323011a55ecd1fc5897c24c4f77cbd upstream.
+
+Setting si_code to 0 is the same a setting si_code to SI_USER which is definitely
+not correct.  With si_code set to SI_USER si_pid and si_uid will be copied to
+userspace instead of si_addr.  Which is very wrong.
+
+So fix this by using a sensible si_code (SEGV_MAPERR) for this failure.
+
+Fixes: b920de1b77b7 ("mn10300: add the MN10300/AM33 architecture to the kernel")
+Cc: David Howells <dhowells@redhat.com>
+Cc: Masakazu Urade <urade.masakazu@jp.panasonic.com>
+Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
+Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/mn10300/mm/misalignment.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/mn10300/mm/misalignment.c
++++ b/arch/mn10300/mm/misalignment.c
+@@ -437,7 +437,7 @@ transfer_failed:
+ 
+       info.si_signo   = SIGSEGV;
+       info.si_errno   = 0;
+-      info.si_code    = 0;
++      info.si_code    = SEGV_MAPERR;
+       info.si_addr    = (void *) regs->pc;
+       force_sig_info(SIGSEGV, &info, current);
+       return;

diff --git a/queue-3.18/series b/queue-3.18/series
index c56d732b1747e8933cfbeefc53dac20aa4fd526f..7eac3215f158b1b017b77964487314206ca17f01 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -41,3 +41,5 @@ alpha-fix-reboot-on-avanti-platform.patch
 xtensa-fix-futex_atomic_cmpxchg_inatomic.patch
 edac-octeon-fix-an-uninitialized-variable-warning.patch
 pktcdvd-fix-pkt_setup_dev-error-path.patch
+acpi-sbshc-remove-raw-pointer-from-printk-message.patch
+mn10300-misalignment-use-sigsegv-segv_maperr-to-report-a-failed-user-copy.patch