]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 3 Oct 2019 08:47:43 +0000 (10:47 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 3 Oct 2019 08:47:43 +0000 (10:47 +0200)
added patches:
alarmtimer-use-eopnotsupp-instead-of-enotsupp.patch
arm-zynq-use-memcpy_toio-instead-of-memcpy-on-smp-bring-up.patch
asoc-intel-fix-use-of-potentially-uninitialized-variable.patch
media-sn9c20x-add-msi-ms-1039-laptop-to-flip_dmi_table.patch

queue-4.4/alarmtimer-use-eopnotsupp-instead-of-enotsupp.patch [new file with mode: 0644]
queue-4.4/arm-zynq-use-memcpy_toio-instead-of-memcpy-on-smp-bring-up.patch [new file with mode: 0644]
queue-4.4/asoc-intel-fix-use-of-potentially-uninitialized-variable.patch [new file with mode: 0644]
queue-4.4/media-sn9c20x-add-msi-ms-1039-laptop-to-flip_dmi_table.patch [new file with mode: 0644]
queue-4.4/series

diff --git a/queue-4.4/alarmtimer-use-eopnotsupp-instead-of-enotsupp.patch b/queue-4.4/alarmtimer-use-eopnotsupp-instead-of-enotsupp.patch
new file mode 100644 (file)
index 0000000..6e1622d
--- /dev/null
@@ -0,0 +1,49 @@
+From f18ddc13af981ce3c7b7f26925f099e7c6929aba Mon Sep 17 00:00:00 2001
+From: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
+Date: Tue, 3 Sep 2019 14:18:02 -0300
+Subject: alarmtimer: Use EOPNOTSUPP instead of ENOTSUPP
+
+From: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
+
+commit f18ddc13af981ce3c7b7f26925f099e7c6929aba upstream.
+
+ENOTSUPP is not supposed to be returned to userspace. This was found on an
+OpenPower machine, where the RTC does not support set_alarm.
+
+On that system, a clock_nanosleep(CLOCK_REALTIME_ALARM, ...) results in
+"524 Unknown error 524"
+
+Replace it with EOPNOTSUPP which results in the expected "95 Operation not
+supported" error.
+
+Fixes: 1c6b39ad3f01 (alarmtimers: Return -ENOTSUPP if no RTC device is present)
+Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Cc: stable@vger.kernel.org
+Link: https://lkml.kernel.org/r/20190903171802.28314-1-cascardo@canonical.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ kernel/time/alarmtimer.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/kernel/time/alarmtimer.c
++++ b/kernel/time/alarmtimer.c
+@@ -530,7 +530,7 @@ static int alarm_timer_create(struct k_i
+       struct alarm_base *base;
+       if (!alarmtimer_get_rtcdev())
+-              return -ENOTSUPP;
++              return -EOPNOTSUPP;
+       if (!capable(CAP_WAKE_ALARM))
+               return -EPERM;
+@@ -759,7 +759,7 @@ static int alarm_timer_nsleep(const cloc
+       struct restart_block *restart;
+       if (!alarmtimer_get_rtcdev())
+-              return -ENOTSUPP;
++              return -EOPNOTSUPP;
+       if (flags & ~TIMER_ABSTIME)
+               return -EINVAL;
diff --git a/queue-4.4/arm-zynq-use-memcpy_toio-instead-of-memcpy-on-smp-bring-up.patch b/queue-4.4/arm-zynq-use-memcpy_toio-instead-of-memcpy-on-smp-bring-up.patch
new file mode 100644 (file)
index 0000000..6b1be05
--- /dev/null
@@ -0,0 +1,48 @@
+From b7005d4ef4f3aa2dc24019ffba03a322557ac43d Mon Sep 17 00:00:00 2001
+From: Luis Araneda <luaraneda@gmail.com>
+Date: Thu, 8 Aug 2019 08:52:43 -0400
+Subject: ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up
+
+From: Luis Araneda <luaraneda@gmail.com>
+
+commit b7005d4ef4f3aa2dc24019ffba03a322557ac43d upstream.
+
+This fixes a kernel panic on memcpy when
+FORTIFY_SOURCE is enabled.
+
+The initial smp implementation on commit aa7eb2bb4e4a
+("arm: zynq: Add smp support")
+used memcpy, which worked fine until commit ee333554fed5
+("ARM: 8749/1: Kconfig: Add ARCH_HAS_FORTIFY_SOURCE")
+enabled overflow checks at runtime, producing a read
+overflow panic.
+
+The computed size of memcpy args are:
+- p_size (dst): 4294967295 = (size_t) -1
+- q_size (src): 1
+- size (len): 8
+
+Additionally, the memory is marked as __iomem, so one of
+the memcpy_* functions should be used for read/write.
+
+Fixes: aa7eb2bb4e4a ("arm: zynq: Add smp support")
+Signed-off-by: Luis Araneda <luaraneda@gmail.com>
+Cc: stable@vger.kernel.org
+Signed-off-by: Michal Simek <michal.simek@xilinx.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/mach-zynq/platsmp.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/mach-zynq/platsmp.c
++++ b/arch/arm/mach-zynq/platsmp.c
+@@ -65,7 +65,7 @@ int zynq_cpun_start(u32 address, int cpu
+                       * 0x4: Jump by mov instruction
+                       * 0x8: Jumping address
+                       */
+-                      memcpy((__force void *)zero, &zynq_secondary_trampoline,
++                      memcpy_toio(zero, &zynq_secondary_trampoline,
+                                                       trampoline_size);
+                       writel(address, zero + trampoline_size);
diff --git a/queue-4.4/asoc-intel-fix-use-of-potentially-uninitialized-variable.patch b/queue-4.4/asoc-intel-fix-use-of-potentially-uninitialized-variable.patch
new file mode 100644 (file)
index 0000000..2e5ef93
--- /dev/null
@@ -0,0 +1,41 @@
+From 810f3b860850148788fc1ed8a6f5f807199fed65 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?=
+ <amadeuszx.slawinski@intel.com>
+Date: Tue, 27 Aug 2019 16:17:08 +0200
+Subject: ASoC: Intel: Fix use of potentially uninitialized variable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Amadeusz Sławiński <amadeuszx.slawinski@intel.com>
+
+commit 810f3b860850148788fc1ed8a6f5f807199fed65 upstream.
+
+If ipc->ops.reply_msg_match is NULL, we may end up using uninitialized
+mask value.
+
+reported by smatch:
+sound/soc/intel/common/sst-ipc.c:266 sst_ipc_reply_find_msg() error: uninitialized symbol 'mask'.
+
+Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@intel.com>
+Link: https://lore.kernel.org/r/20190827141712.21015-3-amadeuszx.slawinski@linux.intel.com
+Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Cc: stable@vger.kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/soc/intel/common/sst-ipc.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/sound/soc/intel/common/sst-ipc.c
++++ b/sound/soc/intel/common/sst-ipc.c
+@@ -211,6 +211,8 @@ struct ipc_message *sst_ipc_reply_find_m
+       if (ipc->ops.reply_msg_match != NULL)
+               header = ipc->ops.reply_msg_match(header, &mask);
++      else
++              mask = (u64)-1;
+       if (list_empty(&ipc->rx_list)) {
+               dev_err(ipc->dev, "error: rx list empty but received 0x%llx\n",
diff --git a/queue-4.4/media-sn9c20x-add-msi-ms-1039-laptop-to-flip_dmi_table.patch b/queue-4.4/media-sn9c20x-add-msi-ms-1039-laptop-to-flip_dmi_table.patch
new file mode 100644 (file)
index 0000000..5f67427
--- /dev/null
@@ -0,0 +1,41 @@
+From 7e0bb5828311f811309bed5749528ca04992af2f Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Sun, 18 Aug 2019 12:03:23 -0300
+Subject: media: sn9c20x: Add MSI MS-1039 laptop to flip_dmi_table
+
+From: Hans de Goede <hdegoede@redhat.com>
+
+commit 7e0bb5828311f811309bed5749528ca04992af2f upstream.
+
+Like a bunch of other MSI laptops the MS-1039 uses a 0c45:627b
+SN9C201 + OV7660 webcam which is mounted upside down.
+
+Add it to the sn9c20x flip_dmi_table to deal with this.
+
+Cc: stable@vger.kernel.org
+Reported-by: Rui Salvaterra <rsalvaterra@gmail.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
+Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/media/usb/gspca/sn9c20x.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/drivers/media/usb/gspca/sn9c20x.c
++++ b/drivers/media/usb/gspca/sn9c20x.c
+@@ -139,6 +139,13 @@ static const struct dmi_system_id flip_d
+               }
+       },
+       {
++              .ident = "MSI MS-1039",
++              .matches = {
++                      DMI_MATCH(DMI_SYS_VENDOR, "MICRO-STAR INT'L CO.,LTD."),
++                      DMI_MATCH(DMI_PRODUCT_NAME, "MS-1039"),
++              }
++      },
++      {
+               .ident = "MSI MS-1632",
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "MSI"),
index 98a0105c9adb52cd9c3d06340c47586205541a47..3fd719323b2c4a67b61612c4d39930c359c057f8 100644 (file)
@@ -81,3 +81,7 @@ parisc-disable-hp-hsc-pci-cards-to-prevent-kernel-crash.patch
 kvm-x86-always-stop-emulation-on-page-fault.patch
 kvm-x86-set-ctxt-have_exception-in-x86_decode_insn.patch
 kvm-x86-manually-calculate-reserved-bits-when-loading-pdptrs.patch
+media-sn9c20x-add-msi-ms-1039-laptop-to-flip_dmi_table.patch
+asoc-intel-fix-use-of-potentially-uninitialized-variable.patch
+arm-zynq-use-memcpy_toio-instead-of-memcpy-on-smp-bring-up.patch
+alarmtimer-use-eopnotsupp-instead-of-enotsupp.patch