fixes for 4.4

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.4/alsa-hda-downgrade-error-message-for-single-cmd-fall.patch b/queue-4.4/alsa-hda-downgrade-error-message-for-single-cmd-fall.patch
new file mode 100644 (file)
index 0000000..122bc0b
--- /dev/null
+++ b/queue-4.4/alsa-hda-downgrade-error-message-for-single-cmd-fall.patch
@@ -0,0 +1,42 @@
+From 3023fe388ff2c9b1be288fb0afab4ff2368a567d Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 16 Dec 2019 16:12:24 +0100
+Subject: ALSA: hda - Downgrade error message for single-cmd fallback
+
+From: Takashi Iwai <tiwai@suse.de>
+
+[ Upstream commit 475feec0c41ad71cb7d02f0310e56256606b57c5 ]
+
+We made the error message for the CORB/RIRB communication clearer by
+upgrading to dev_WARN() so that user can notice better.  But this
+struck us like a boomerang: now it caught syzbot and reported back as
+a fatal issue although it's not really any too serious bug that worth
+for stopping the whole system.
+
+OK, OK, let's be softy, downgrade it to the standard dev_err() again.
+
+Fixes: dd65f7e19c69 ("ALSA: hda - Show the fatal CORB/RIRB error more clearly")
+Reported-by: syzbot+b3028ac3933f5c466389@syzkaller.appspotmail.com
+Link: https://lore.kernel.org/r/20191216151224.30013-1-tiwai@suse.de
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ sound/pci/hda/hda_controller.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c
+index 9cdf86f04e03..a25e34b2f82a 100644
+--- a/sound/pci/hda/hda_controller.c
++++ b/sound/pci/hda/hda_controller.c
+@@ -673,7 +673,7 @@ static int azx_rirb_get_response(struct hdac_bus *bus, unsigned int addr,
+               return -EAGAIN; /* give a chance to retry */
+       }
+ 
+-      dev_WARN(chip->card->dev,
++      dev_err(chip->card->dev,
+               "azx_get_response timeout, switching to single_cmd mode: last cmd=0x%08x\n",
+               bus->last_cmd[addr]);
+       chip->single_cmd = 1;
+-- 
+2.20.1
+

diff --git a/queue-4.4/series b/queue-4.4/series
index c16c836ce794b5424addfdc5f78dd48fd1b6dae9..7712a480d6a65f6b5ad98a6ee5285ac9db5d56f3 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -124,3 +124,4 @@ libfdt-define-int32_max-and-uint32_max-in-libfdt_env.patch
 s390-cpum_sf-check-for-sdbt-and-sdb-consistency.patch
 ocfs2-fix-passing-zero-to-ptr_err-warning.patch
 kernel-sysctl-make-drop_caches-write-only.patch
+alsa-hda-downgrade-error-message-for-single-cmd-fall.patch