Home Home > GIT Browse > SLE12-SP3
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-05-20 17:30:11 +0200
committerTakashi Iwai <tiwai@suse.de>2019-05-20 17:30:11 +0200
commitfa05d87bc4576088cd98abc40792a5233890137e (patch)
tree55114543c1a68ec46f96d711890757d718a4859f
parentdb8b28ce96e9b9f205dbc24fae132a028d0f2015 (diff)
parent04a0e6b8f6fd74fb675bdbe8f79c4beee813082b (diff)
Merge branch 'users/oneukum/SLE12-SP3/for-next' into SLE12-SP3SLE12-SP3
Pull assorted fixes from Oliver Neukum (bsc#1120902 bsc#1135642)
-rw-r--r--blacklist.conf1
-rw-r--r--patches.fixes/0001-PCI-Mark-Atheros-AR9462-to-avoid-bus-reset.patch37
-rw-r--r--patches.fixes/0001-keys-Timestamp-new-keys.patch28
-rw-r--r--patches.fixes/0001-media-pvrusb2-Prevent-a-buffer-overflow.patch61
-rw-r--r--series.conf3
5 files changed, 130 insertions, 0 deletions
diff --git a/blacklist.conf b/blacklist.conf
index 201a8afbe5..e47ad50494 100644
--- a/blacklist.conf
+++ b/blacklist.conf
@@ -653,3 +653,4 @@ c15562c0dcb2c7f26e891923b784cf1926b8c833 # we don't provide libusbip from here
b68f3cc7d978943fcf85148165b00594c38db776 # We're not building 32bit x86 kernels from this branch
bd99f9a159b072be743c6681f81e06b9ebd370a4 # not needed for bsc#1126040 backport
250854eed5d45a73d81e4137dfd85180af6f2ec3 # falsely attributed
+f741494363c6c90e6744117d2771bbdf0fb3c455 # our backport of 287980e49ffc0f6d911601e7e352a812ed27768e is only partial, kernel not affected
diff --git a/patches.fixes/0001-PCI-Mark-Atheros-AR9462-to-avoid-bus-reset.patch b/patches.fixes/0001-PCI-Mark-Atheros-AR9462-to-avoid-bus-reset.patch
new file mode 100644
index 0000000000..3a75d80983
--- /dev/null
+++ b/patches.fixes/0001-PCI-Mark-Atheros-AR9462-to-avoid-bus-reset.patch
@@ -0,0 +1,37 @@
+From 6afb7e26978da5e86e57e540fdce65c8b04f398a Mon Sep 17 00:00:00 2001
+From: James Prestwood <james.prestwood@linux.intel.com>
+Date: Mon, 7 Jan 2019 13:32:48 -0800
+Subject: [PATCH] PCI: Mark Atheros AR9462 to avoid bus reset
+Git-commit: 6afb7e26978da5e86e57e540fdce65c8b04f398a
+Patch-mainline: v5.2-rc1
+References: bsc#1135642
+
+When using PCI passthrough with this device, the host machine locks up
+completely when starting the VM, requiring a hard reboot. Add a quirk to
+avoid bus resets on this device.
+
+Fixes: c3e59ee4e766 ("PCI: Mark Atheros AR93xx to avoid bus reset")
+Link: https://lore.kernel.org/linux-pci/20190107213248.3034-1-james.prestwood@linux.intel.com
+Signed-off-by: James Prestwood <james.prestwood@linux.intel.com>
+Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+CC: stable@vger.kernel.org # v3.14+
+Signed-off-by: Oliver Neukum <oneukum@suse.com>
+---
+ drivers/pci/quirks.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
+index 68bee35fcafa..9b9e28854a58 100644
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -3408,6 +3408,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0030, quirk_no_bus_reset);
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0032, quirk_no_bus_reset);
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x003c, quirk_no_bus_reset);
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0033, quirk_no_bus_reset);
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0034, quirk_no_bus_reset);
+
+ /*
+ * Root port on some Cavium CN8xxx chips do not successfully complete a bus
+--
+2.16.4
+
diff --git a/patches.fixes/0001-keys-Timestamp-new-keys.patch b/patches.fixes/0001-keys-Timestamp-new-keys.patch
new file mode 100644
index 0000000000..8eceed12e9
--- /dev/null
+++ b/patches.fixes/0001-keys-Timestamp-new-keys.patch
@@ -0,0 +1,28 @@
+From 7c1857bdbdf1e4c541e45eab477ee23ed4333ea4 Mon Sep 17 00:00:00 2001
+From: David Howells <dhowells@redhat.com>
+Date: Thu, 14 Feb 2019 16:20:37 +0000
+Subject: [PATCH] keys: Timestamp new keys
+Git-commit: 7c1857bdbdf1e4c541e45eab477ee23ed4333ea4
+Patch-mainline: v5.0
+References: bsc#1120902
+
+Set the timestamp on new keys rather than leaving it unset.
+
+Fixes: 31d5a79d7f3d ("KEYS: Do LRU discard in full keyrings")
+Signed-off-by: David Howells <dhowells@redhat.com>
+Signed-off-by: James Morris <james.morris@microsoft.com>
+Signed-off-by: Oliver Neukum <oneukum@suse.com>
+---
+ security/keys/key.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/security/keys/key.c
++++ b/security/keys/key.c
+@@ -291,6 +291,7 @@ struct key *key_alloc(struct key_type *t
+ key->uid = uid;
+ key->gid = gid;
+ key->perm = perm;
++ key->last_used_at = ktime_get_real_seconds();
+
+ if (!(flags & KEY_ALLOC_NOT_IN_QUOTA))
+ key->flags |= 1 << KEY_FLAG_IN_QUOTA;
diff --git a/patches.fixes/0001-media-pvrusb2-Prevent-a-buffer-overflow.patch b/patches.fixes/0001-media-pvrusb2-Prevent-a-buffer-overflow.patch
new file mode 100644
index 0000000000..5c60aa313c
--- /dev/null
+++ b/patches.fixes/0001-media-pvrusb2-Prevent-a-buffer-overflow.patch
@@ -0,0 +1,61 @@
+From c1ced46c7b49ad7bc064e68d966e0ad303f917fb Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Mon, 8 Apr 2019 05:52:38 -0400
+Subject: [PATCH] media: pvrusb2: Prevent a buffer overflow
+Git-commit: c1ced46c7b49ad7bc064e68d966e0ad303f917fb
+Patch-mainline: v5.2-rc1
+References: bsc#1135642
+
+The ctrl_check_input() function is called from pvr2_ctrl_range_check().
+It's supposed to validate user supplied input and return true or false
+depending on whether the input is valid or not. The problem is that
+negative shifts or shifts greater than 31 are undefined in C. In
+practice with GCC they result in shift wrapping so this function returns
+true for some inputs which are not valid and this could result in a
+buffer overflow:
+
+ drivers/media/usb/pvrusb2/pvrusb2-ctrl.c:205 pvr2_ctrl_get_valname()
+ warn: uncapped user index 'names[val]'
+
+The cptr->hdw->input_allowed_mask mask is configured in pvr2_hdw_create()
+and the highest valid bit is BIT(4).
+
+Fixes: 7fb20fa38caa ("V4L/DVB (7299): pvrusb2: Improve logic which handles input choice availability")
+
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
+Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Signed-off-by: Oliver Neukum <oneukum@suse.com>
+---
+ drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 2 ++
+ drivers/media/usb/pvrusb2/pvrusb2-hdw.h | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
+index 51112b7988e4..816c85786c2a 100644
+--- a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
++++ b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
+@@ -666,6 +666,8 @@ static int ctrl_get_input(struct pvr2_ctrl *cptr,int *vp)
+
+ static int ctrl_check_input(struct pvr2_ctrl *cptr,int v)
+ {
++ if (v < 0 || v > PVR2_CVAL_INPUT_MAX)
++ return 0;
+ return ((1 << v) & cptr->hdw->input_allowed_mask) != 0;
+ }
+
+diff --git a/drivers/media/usb/pvrusb2/pvrusb2-hdw.h b/drivers/media/usb/pvrusb2/pvrusb2-hdw.h
+index 25648add77e5..bd2b7a67b732 100644
+--- a/drivers/media/usb/pvrusb2/pvrusb2-hdw.h
++++ b/drivers/media/usb/pvrusb2/pvrusb2-hdw.h
+@@ -50,6 +50,7 @@
+ #define PVR2_CVAL_INPUT_COMPOSITE 2
+ #define PVR2_CVAL_INPUT_SVIDEO 3
+ #define PVR2_CVAL_INPUT_RADIO 4
++#define PVR2_CVAL_INPUT_MAX PVR2_CVAL_INPUT_RADIO
+
+ enum pvr2_config {
+ pvr2_config_empty, /* No configuration */
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index db069943d5..d7c8524232 100644
--- a/series.conf
+++ b/series.conf
@@ -25228,6 +25228,7 @@
patches.suse/floppy-check_events-callback-should-not-return-a-neg.patch
patches.fixes/md-raid1-don-t-clear-bitmap-bits-on-interrupted-reco.patch
patches.suse/0001-net-dsa-bcm_sf2-Do-not-assume-DSA-master-supports-Wo.patch
+ patches.fixes/0001-keys-Timestamp-new-keys.patch
patches.suse/mm-memory_hotplug-fix-off-by-one-in-is_pageblock_rem.patch
patches.suse/kallsyms-handle-too-long-symbols-in-kallsyms-c.patch
patches.fixes/copy_mount_string-Limit-string-length-to-PATH_MAX.patch
@@ -25357,6 +25358,7 @@
patches.drivers/Bluetooth-hidp-fix-buffer-overflow.patch
patches.fixes/0001-UAS-fix-alignment-of-scatter-gather-segments.patch
patches.fixes/ipmi-ssif-compare-block-number-correctly-for-multi-p.patch
+ patches.fixes/0001-media-pvrusb2-Prevent-a-buffer-overflow.patch
patches.fixes/0001-drm-i915-Fix-I915_EXEC_RING_MASK.patch
patches.fixes/0002-drm-fb-helper-dpms_legacy-Only-set-on-connectors-in-.patch
patches.fixes/0002-drm-rockchip-shutdown-drm-subsystem-on-shutdown.patch
@@ -25384,6 +25386,7 @@
patches.arch/x86-speculation-mds-add-smt-warning-message.patch
patches.arch/x86-speculation-mds-print-smt-vulnerable-on-msbds-with-mitigations-off.patch
patches.arch/x86-speculation-mds-add-mitigations-support-for-mds.patch
+ patches.fixes/0001-PCI-Mark-Atheros-AR9462-to-avoid-bus-reset.patch
patches.fixes/0001-backlight-lm3630a-Return-0-on-success-in-update_stat.patch
patches.fixes/0003-drm-bridge-adv7511-Fix-low-refresh-rate-selection.patch