4.4-stable patches

added patches:
	alsa-drivers-opl3-fix-incorrect-use-of-vp-state.patch
	alsa-jack-check-the-return-value-of-kstrdup.patch

diff --git a/queue-4.4/alsa-drivers-opl3-fix-incorrect-use-of-vp-state.patch b/queue-4.4/alsa-drivers-opl3-fix-incorrect-use-of-vp-state.patch
new file mode 100644 (file)
index 0000000..3f3f846
--- /dev/null
+++ b/queue-4.4/alsa-drivers-opl3-fix-incorrect-use-of-vp-state.patch
@@ -0,0 +1,37 @@
+From 2dee54b289fbc810669a1b2b8a0887fa1c9a14d7 Mon Sep 17 00:00:00 2001
+From: Colin Ian King <colin.i.king@gmail.com>
+Date: Sun, 12 Dec 2021 17:20:25 +0000
+Subject: ALSA: drivers: opl3: Fix incorrect use of vp->state
+
+From: Colin Ian King <colin.i.king@gmail.com>
+
+commit 2dee54b289fbc810669a1b2b8a0887fa1c9a14d7 upstream.
+
+Static analysis with scan-build has found an assignment to vp2 that is
+never used. It seems that the check on vp->state > 0 should be actually
+on vp2->state instead. Fix this.
+
+This dates back to 2002, I found the offending commit from the git
+history git://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git,
+commit 91e39521bbf6 ("[PATCH] ALSA patch for 2.5.4")
+
+Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
+Cc: <stable@vger.kernel.org>
+Link: https://lore.kernel.org/r/20211212172025.470367-1-colin.i.king@gmail.com
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/drivers/opl3/opl3_midi.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/drivers/opl3/opl3_midi.c
++++ b/sound/drivers/opl3/opl3_midi.c
+@@ -415,7 +415,7 @@ void snd_opl3_note_on(void *p, int note,
+       }
+       if (instr_4op) {
+               vp2 = &opl3->voices[voice + 3];
+-              if (vp->state > 0) {
++              if (vp2->state > 0) {
+                       opl3_reg = reg_side | (OPL3_REG_KEYON_BLOCK +
+                                              voice_offset + 3);
+                       reg_val = vp->keyon_reg & ~OPL3_KEYON_BIT;

diff --git a/queue-4.4/alsa-jack-check-the-return-value-of-kstrdup.patch b/queue-4.4/alsa-jack-check-the-return-value-of-kstrdup.patch
new file mode 100644 (file)
index 0000000..32b35da
--- /dev/null
+++ b/queue-4.4/alsa-jack-check-the-return-value-of-kstrdup.patch
@@ -0,0 +1,33 @@
+From c01c1db1dc632edafb0dff32d40daf4f9c1a4e19 Mon Sep 17 00:00:00 2001
+From: Xiaoke Wang <xkernel.wang@foxmail.com>
+Date: Mon, 13 Dec 2021 15:39:31 +0800
+Subject: ALSA: jack: Check the return value of kstrdup()
+
+From: Xiaoke Wang <xkernel.wang@foxmail.com>
+
+commit c01c1db1dc632edafb0dff32d40daf4f9c1a4e19 upstream.
+
+kstrdup() can return NULL, it is better to check the return value of it.
+
+Signed-off-by: Xiaoke Wang <xkernel.wang@foxmail.com>
+Cc: <stable@vger.kernel.org>
+Link: https://lore.kernel.org/r/tencent_094816F3522E0DC704056C789352EBBF0606@qq.com
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/core/jack.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/sound/core/jack.c
++++ b/sound/core/jack.c
+@@ -227,6 +227,10 @@ int snd_jack_new(struct snd_card *card,
+               return -ENOMEM;
+ 
+       jack->id = kstrdup(id, GFP_KERNEL);
++      if (jack->id == NULL) {
++              kfree(jack);
++              return -ENOMEM;
++      }
+ 
+       /* don't creat input device for phantom jack */
+       if (!phantom_jack) {

diff --git a/queue-4.4/series b/queue-4.4/series
index 286fc2b64a95dbb5d274ea102fb41b1a927509c0..a0e40251588d976363779493ca2e47ec743a677d 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -6,3 +6,5 @@ qlcnic-potential-dereference-null-pointer-of-rx_queu.patch
 bonding-fix-ad_actor_system-option-setting-to-defaul.patch
 drivers-net-smc911x-check-for-error-irq.patch
 hwmon-lm90-fix-usage-of-config2-register-in-detect-f.patch
+alsa-jack-check-the-return-value-of-kstrdup.patch
+alsa-drivers-opl3-fix-incorrect-use-of-vp-state.patch