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