Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlaf Hering <ohering@suse.de>2019-11-08 08:20:46 +0100
committerOlaf Hering <ohering@suse.de>2019-11-08 08:20:46 +0100
commit52b761d2a77600b594fc8803a1d0b86b66b0e57a (patch)
treedfd1ac1b2eb89a8451e69f587a3bff123a080ef1
parentd6ea1313f578fa021e3935ee053811720831e314 (diff)
parent8ff8531a521887cff8722dfea805ff0dbd44943e (diff)
Merge remote-tracking branch 'kerncvs/SLE12-SP4' into SLE12-SP4-AZURE
-rw-r--r--blacklist.conf1
-rw-r--r--patches.suse/Input-synaptics-rmi4-avoid-processing-unknown-IRQs.patch72
-rw-r--r--patches.suse/ipv4-set-the-tcp_min_rtt_wlen-range-from-0-to-one-da.patch2
-rw-r--r--patches.suse/mISDN-enforce-CAP_NET_RAW-for-raw-sockets.patch2
-rw-r--r--patches.suse/powerpc-fadump-when-fadump-is-supported-register-the.patch39
-rw-r--r--series.conf1
6 files changed, 21 insertions, 96 deletions
diff --git a/blacklist.conf b/blacklist.conf
index 8cd8b6af23..fb0f17dad1 100644
--- a/blacklist.conf
+++ b/blacklist.conf
@@ -1393,3 +1393,4 @@ ab7b2577f0d119052b98b8d913bad369ac2760eb # amd_iommu_devtable_lock is sufficient
20bb759a66be52cf4a9ddd17fddaf509e11490cd # we don't have CONFIG_PREEMPT, bsc#1155318
015664d15270a112c2371d812f03f7c579b35a73 # removes a driver, ultimate kABI breakage
8444efc4a052332d643ed5c8aebcca148c7de032 # cleanup only, no change of generated code
+363c53875aef8fce69d4a2d0873919ccc7d9e2ad # input/synaptics: causes a regression (bsc#1155982)
diff --git a/patches.suse/Input-synaptics-rmi4-avoid-processing-unknown-IRQs.patch b/patches.suse/Input-synaptics-rmi4-avoid-processing-unknown-IRQs.patch
deleted file mode 100644
index 146afcc489..0000000000
--- a/patches.suse/Input-synaptics-rmi4-avoid-processing-unknown-IRQs.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 363c53875aef8fce69d4a2d0873919ccc7d9e2ad Mon Sep 17 00:00:00 2001
-From: Evan Green <evgreen@chromium.org>
-Date: Fri, 11 Oct 2019 17:22:09 -0700
-Subject: [PATCH] Input: synaptics-rmi4 - avoid processing unknown IRQs
-Git-commit: 363c53875aef8fce69d4a2d0873919ccc7d9e2ad
-Patch-mainline: v5.4-rc4
-References: bsc#1051510
-
-rmi_process_interrupt_requests() calls handle_nested_irq() for
-each interrupt status bit it finds. If the irq domain mapping for
-this bit had not yet been set up, then it ends up calling
-handle_nested_irq(0), which causes a NULL pointer dereference.
-
-There's already code that masks the irq_status bits coming out of the
-hardware with current_irq_mask, presumably to avoid this situation.
-However current_irq_mask seems to more reflect the actual mask set
-in the hardware rather than the IRQs software has set up and registered
-for. For example, in rmi_driver_reset_handler(), the current_irq_mask
-is initialized based on what is read from the hardware. If the reset
-value of this mask enables IRQs that Linux has not set up yet, then
-we end up in this situation.
-
-There appears to be a third unused bitmask that used to serve this
-purpose, fn_irq_bits. Use that bitmask instead of current_irq_mask
-to avoid calling handle_nested_irq() on IRQs that have not yet been
-set up.
-
-Signed-off-by: Evan Green <evgreen@chromium.org>
-Reviewed-by: Andrew Duggan <aduggan@synaptics.com>
-Link: https://lore.kernel.org/r/20191008223657.163366-1-evgreen@chromium.org
-Cc: stable@vger.kernel.org
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Acked-by: Takashi Iwai <tiwai@suse.de>
-
----
- drivers/input/rmi4/rmi_driver.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
-index 772493b1f665..190b9974526b 100644
---- a/drivers/input/rmi4/rmi_driver.c
-+++ b/drivers/input/rmi4/rmi_driver.c
-@@ -146,7 +146,7 @@ static int rmi_process_interrupt_requests(struct rmi_device *rmi_dev)
- }
-
- mutex_lock(&data->irq_mutex);
-- bitmap_and(data->irq_status, data->irq_status, data->current_irq_mask,
-+ bitmap_and(data->irq_status, data->irq_status, data->fn_irq_bits,
- data->irq_count);
- /*
- * At this point, irq_status has all bits that are set in the
-@@ -385,6 +385,8 @@ static int rmi_driver_set_irq_bits(struct rmi_device *rmi_dev,
- bitmap_copy(data->current_irq_mask, data->new_irq_mask,
- data->num_of_irq_regs);
-
-+ bitmap_or(data->fn_irq_bits, data->fn_irq_bits, mask, data->irq_count);
-+
- error_unlock:
- mutex_unlock(&data->irq_mutex);
- return error;
-@@ -398,6 +400,8 @@ static int rmi_driver_clear_irq_bits(struct rmi_device *rmi_dev,
- struct device *dev = &rmi_dev->dev;
-
- mutex_lock(&data->irq_mutex);
-+ bitmap_andnot(data->fn_irq_bits,
-+ data->fn_irq_bits, mask, data->irq_count);
- bitmap_andnot(data->new_irq_mask,
- data->current_irq_mask, mask, data->irq_count);
-
---
-2.16.4
-
diff --git a/patches.suse/ipv4-set-the-tcp_min_rtt_wlen-range-from-0-to-one-da.patch b/patches.suse/ipv4-set-the-tcp_min_rtt_wlen-range-from-0-to-one-da.patch
index 8a241ad25a..e962fb970a 100644
--- a/patches.suse/ipv4-set-the-tcp_min_rtt_wlen-range-from-0-to-one-da.patch
+++ b/patches.suse/ipv4-set-the-tcp_min_rtt_wlen-range-from-0-to-one-da.patch
@@ -3,7 +3,7 @@ Date: Tue, 16 Apr 2019 09:47:24 +0800
Subject: ipv4: set the tcp_min_rtt_wlen range from 0 to one day
Git-commit: 19fad20d15a6494f47f85d869f00b11343ee5c78
Patch-mainline: v5.1-rc7
-References: networking-stable-19_04_30
+References: networking-stable-19_04_30, CVE-2019-18805, bsc#1156187
There is a UBSAN report as below:
UBSAN: Undefined behaviour in net/ipv4/tcp_input.c:2877:56
diff --git a/patches.suse/mISDN-enforce-CAP_NET_RAW-for-raw-sockets.patch b/patches.suse/mISDN-enforce-CAP_NET_RAW-for-raw-sockets.patch
index 974cdeef4e..262d8816b5 100644
--- a/patches.suse/mISDN-enforce-CAP_NET_RAW-for-raw-sockets.patch
+++ b/patches.suse/mISDN-enforce-CAP_NET_RAW-for-raw-sockets.patch
@@ -4,7 +4,7 @@ Date: Fri, 20 Sep 2019 09:35:45 +0200
Subject: [PATCH] mISDN: enforce CAP_NET_RAW for raw sockets
Git-commit: b91ee4aa2a2199ba4d4650706c272985a5a32d80
Patch-mainline: v5.4-rc1
-References: bsc#1051510
+References: bsc#1051510 bsc#1152782 CVE-2019-17055
When creating a raw AF_ISDN socket, CAP_NET_RAW needs to be checked
first.
diff --git a/patches.suse/powerpc-fadump-when-fadump-is-supported-register-the.patch b/patches.suse/powerpc-fadump-when-fadump-is-supported-register-the.patch
index 36df0b9c09..9c7c72fb43 100644
--- a/patches.suse/powerpc-fadump-when-fadump-is-supported-register-the.patch
+++ b/patches.suse/powerpc-fadump-when-fadump-is-supported-register-the.patch
@@ -1,10 +1,8 @@
-From d34ad20a798191a6217cf245b85a26b07c0edd01 Mon Sep 17 00:00:00 2001
+From 3924dc2132fe0dd6e7d7cac6f5cd58ca3e3ec1ea Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Tue, 20 Aug 2019 13:29:45 +0200
-Subject: [PATCH v2] powerpc/fadump: when fadump is supported register the
- fadump sysfs files.
-To: linuxppc-dev@lists.ozlabs.org
-Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Michael Ellerman <mpe@ellerman.id.au>, Michal Suchanek <msuchanek@suse.de>, Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>, Hari Bathini <hbathini@linux.vnet.ibm.com>, Christophe Leroy <christophe.leroy@c-s.fr>, Yangtao Li <tiny.windzz@gmail.com>, Thomas Gleixner <tglx@linutronix.de>, linux-kernel@vger.kernel.org
+Subject: [PATCH] powerpc/fadump: when fadump is supported register the fadump
+ sysfs files.
References: bsc#1146352
Patch-mainline: submitted https://patchwork.ozlabs.org/patch/1154687/
@@ -18,18 +16,20 @@ fadumpv2 in the future.
With this patch sysfs files are available whenever fadump is supported
by firmware.
+There is duplicate message about lack of support by firmware in
+fadump_reserve_mem and setup_fadump. Remove the duplicate message in
+setup_fadump.
+
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
-v2: move the sysfs initialization earlier to avoid condition nesting
----
- arch/powerpc/kernel/fadump.c | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
+ arch/powerpc/kernel/fadump.c | 14 ++++++--------
+ 1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
-index 4eab97292cc2..13741380b2f7 100644
+index 3b6be0f4a36d..0e5c33d89a98 100644
--- a/arch/powerpc/kernel/fadump.c
+++ b/arch/powerpc/kernel/fadump.c
-@@ -1671,16 +1671,20 @@ static void fadump_init_files(void)
+@@ -1693,16 +1693,15 @@ static void fadump_init_files(void)
*/
int __init setup_fadump(void)
{
@@ -37,15 +37,12 @@ index 4eab97292cc2..13741380b2f7 100644
- return 0;
-
- if (!fw_dump.fadump_supported) {
-+ if (!fw_dump.fadump_supported && fw_dump.fadump_enabled) {
- printk(KERN_ERR "Firmware-assisted dump is not supported on"
- " this hardware\n");
-- return 0;
- }
-
+- printk(KERN_ERR "Firmware-assisted dump is not supported on"
+- " this hardware\n");
+ if (!fw_dump.fadump_supported)
-+ return 0;
-+
+ return 0;
+- }
+
+ fadump_init_files();
fadump_show_config();
+
@@ -55,7 +52,7 @@ index 4eab97292cc2..13741380b2f7 100644
/*
* If dump data is available then see if it is valid and prepare for
* saving it to the disk.
-@@ -1696,7 +1700,6 @@ int __init setup_fadump(void)
+@@ -1718,7 +1717,6 @@ int __init setup_fadump(void)
/* Initialize the kernel dump memory structure for FAD registration. */
else if (fw_dump.reserve_dump_area_size)
init_fadump_mem_struct(&fdm, fw_dump.reserve_dump_area_start);
@@ -64,5 +61,5 @@ index 4eab97292cc2..13741380b2f7 100644
return 1;
}
--
-2.22.0
+2.23.0
diff --git a/series.conf b/series.conf
index 0850fa3e1c..aff335325c 100644
--- a/series.conf
+++ b/series.conf
@@ -25430,7 +25430,6 @@
patches.suse/scsi-zfcp-fix-reaction-on-bit-error-threshold-notification
patches.suse/platform-x86-classmate-laptop-remove-unused-variable.patch
patches.suse/Input-da9063-fix-capability-and-drop-KEY_SLEEP.patch
- patches.suse/Input-synaptics-rmi4-avoid-processing-unknown-IRQs.patch
patches.suse/Revert-drm-radeon-Fix-EEH-during-kexec.patch
patches.suse/drm-edid-Add-6-bpc-quirk-for-SDC-panel-in-Lenovo-G50.patch
patches.suse/drm-msm-dsi-Implement-reset-correctly.patch