]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Jan 2020 20:09:30 +0000 (21:09 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Jan 2020 20:09:30 +0000 (21:09 +0100)
added patches:
alsa-cs4236-fix-error-return-comparison-of-an-unsigned-integer.patch
alsa-firewire-motu-correct-a-typo-in-the-clock-proc-string.patch
exit-panic-before-exit_mm-on-global-init-exit.patch

queue-4.14/alsa-cs4236-fix-error-return-comparison-of-an-unsigned-integer.patch [new file with mode: 0644]
queue-4.14/alsa-firewire-motu-correct-a-typo-in-the-clock-proc-string.patch [new file with mode: 0644]
queue-4.14/exit-panic-before-exit_mm-on-global-init-exit.patch [new file with mode: 0644]
queue-4.14/series

diff --git a/queue-4.14/alsa-cs4236-fix-error-return-comparison-of-an-unsigned-integer.patch b/queue-4.14/alsa-cs4236-fix-error-return-comparison-of-an-unsigned-integer.patch
new file mode 100644 (file)
index 0000000..131ab0d
--- /dev/null
@@ -0,0 +1,37 @@
+From d60229d84846a8399257006af9c5444599f64361 Mon Sep 17 00:00:00 2001
+From: Colin Ian King <colin.king@canonical.com>
+Date: Fri, 22 Nov 2019 13:13:54 +0000
+Subject: ALSA: cs4236: fix error return comparison of an unsigned integer
+
+From: Colin Ian King <colin.king@canonical.com>
+
+commit d60229d84846a8399257006af9c5444599f64361 upstream.
+
+The return from pnp_irq is an unsigned integer type resource_size_t
+and hence the error check for a positive non-error code is always
+going to be true.  A check for a non-failure return from pnp_irq
+should in fact be for (resource_size_t)-1 rather than >= 0.
+
+Addresses-Coverity: ("Unsigned compared against 0")
+Fixes: a9824c868a2c ("[ALSA] Add CS4232 PnP BIOS support")
+Signed-off-by: Colin Ian King <colin.king@canonical.com>
+Link: https://lore.kernel.org/r/20191122131354.58042-1-colin.king@canonical.com
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/isa/cs423x/cs4236.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/sound/isa/cs423x/cs4236.c
++++ b/sound/isa/cs423x/cs4236.c
+@@ -293,7 +293,8 @@ static int snd_cs423x_pnp_init_mpu(int d
+       } else {
+               mpu_port[dev] = pnp_port_start(pdev, 0);
+               if (mpu_irq[dev] >= 0 &&
+-                  pnp_irq_valid(pdev, 0) && pnp_irq(pdev, 0) >= 0) {
++                  pnp_irq_valid(pdev, 0) &&
++                  pnp_irq(pdev, 0) != (resource_size_t)-1) {
+                       mpu_irq[dev] = pnp_irq(pdev, 0);
+               } else {
+                       mpu_irq[dev] = -1;      /* disable interrupt */
diff --git a/queue-4.14/alsa-firewire-motu-correct-a-typo-in-the-clock-proc-string.patch b/queue-4.14/alsa-firewire-motu-correct-a-typo-in-the-clock-proc-string.patch
new file mode 100644 (file)
index 0000000..ebec5f4
--- /dev/null
@@ -0,0 +1,32 @@
+From 0929249e3be3bb82ee6cfec0025f4dde952210b3 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Wed, 30 Oct 2019 11:09:21 +0100
+Subject: ALSA: firewire-motu: Correct a typo in the clock proc string
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 0929249e3be3bb82ee6cfec0025f4dde952210b3 upstream.
+
+Just fix a typo of "S/PDIF" in the clock name string.
+
+Fixes: 4638ec6ede08 ("ALSA: firewire-motu: add proc node to show current statuc of clock and packet formats")
+Acked-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
+Link: https://lore.kernel.org/r/20191030100921.3826-1-tiwai@suse.de
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/firewire/motu/motu-proc.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/firewire/motu/motu-proc.c
++++ b/sound/firewire/motu/motu-proc.c
+@@ -17,7 +17,7 @@ static const char *const clock_names[] =
+       [SND_MOTU_CLOCK_SOURCE_SPDIF_ON_OPT] = "S/PDIF on optical interface",
+       [SND_MOTU_CLOCK_SOURCE_SPDIF_ON_OPT_A] = "S/PDIF on optical interface A",
+       [SND_MOTU_CLOCK_SOURCE_SPDIF_ON_OPT_B] = "S/PDIF on optical interface B",
+-      [SND_MOTU_CLOCK_SOURCE_SPDIF_ON_COAX] = "S/PCIF on coaxial interface",
++      [SND_MOTU_CLOCK_SOURCE_SPDIF_ON_COAX] = "S/PDIF on coaxial interface",
+       [SND_MOTU_CLOCK_SOURCE_AESEBU_ON_XLR] = "AESEBU on XLR interface",
+       [SND_MOTU_CLOCK_SOURCE_WORD_ON_BNC] = "Word clock on BNC interface",
+ };
diff --git a/queue-4.14/exit-panic-before-exit_mm-on-global-init-exit.patch b/queue-4.14/exit-panic-before-exit_mm-on-global-init-exit.patch
new file mode 100644 (file)
index 0000000..41e72a6
--- /dev/null
@@ -0,0 +1,62 @@
+From 43cf75d96409a20ef06b756877a2e72b10a026fc Mon Sep 17 00:00:00 2001
+From: chenqiwu <chenqiwu@xiaomi.com>
+Date: Thu, 19 Dec 2019 14:29:53 +0800
+Subject: exit: panic before exit_mm() on global init exit
+
+From: chenqiwu <chenqiwu@xiaomi.com>
+
+commit 43cf75d96409a20ef06b756877a2e72b10a026fc upstream.
+
+Currently, when global init and all threads in its thread-group have exited
+we panic via:
+do_exit()
+-> exit_notify()
+   -> forget_original_parent()
+      -> find_child_reaper()
+This makes it hard to extract a useable coredump for global init from a
+kernel crashdump because by the time we panic exit_mm() will have already
+released global init's mm.
+This patch moves the panic futher up before exit_mm() is called. As was the
+case previously, we only panic when global init and all its threads in the
+thread-group have exited.
+
+Signed-off-by: chenqiwu <chenqiwu@xiaomi.com>
+Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
+Acked-by: Oleg Nesterov <oleg@redhat.com>
+[christian.brauner@ubuntu.com: fix typo, rewrite commit message]
+Link: https://lore.kernel.org/r/1576736993-10121-1-git-send-email-qiwuchen55@gmail.com
+Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ kernel/exit.c |   12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+--- a/kernel/exit.c
++++ b/kernel/exit.c
+@@ -577,10 +577,6 @@ static struct task_struct *find_child_re
+       }
+       write_unlock_irq(&tasklist_lock);
+-      if (unlikely(pid_ns == &init_pid_ns)) {
+-              panic("Attempted to kill init! exitcode=0x%08x\n",
+-                      father->signal->group_exit_code ?: father->exit_code);
+-      }
+       list_for_each_entry_safe(p, n, dead, ptrace_entry) {
+               list_del_init(&p->ptrace_entry);
+@@ -823,6 +819,14 @@ void __noreturn do_exit(long code)
+       acct_update_integrals(tsk);
+       group_dead = atomic_dec_and_test(&tsk->signal->live);
+       if (group_dead) {
++              /*
++               * If the last thread of global init has exited, panic
++               * immediately to get a useable coredump.
++               */
++              if (unlikely(is_global_init(tsk)))
++                      panic("Attempted to kill init! exitcode=0x%08x\n",
++                              tsk->signal->group_exit_code ?: (int)code);
++
+ #ifdef CONFIG_POSIX_TIMERS
+               hrtimer_cancel(&tsk->signal->real_timer);
+               exit_itimers(tsk->signal);
index 27bb203e08fb5a5db40a0c8b80117c743872bbc8..0e1c4f0549cf558c242ca5828ad36a89fc1cfd74 100644 (file)
@@ -38,3 +38,6 @@ ata-ahci_brcm-fix-ahci-resources-management.patch
 gpiolib-fix-up-emulated-open-drain-outputs.patch
 tracing-fix-lock-inversion-in-trace_event_enable_tgid_record.patch
 tracing-have-the-histogram-compare-functions-convert-to-u64-first.patch
+alsa-cs4236-fix-error-return-comparison-of-an-unsigned-integer.patch
+alsa-firewire-motu-correct-a-typo-in-the-clock-proc-string.patch
+exit-panic-before-exit_mm-on-global-init-exit.patch