Commit 333f3143 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda - Fix potential endless loop at applying quirks

Since the chained quirks via chained_before flag is applied before the
depth check, it may lead to the endless recursive calls, when the
chain were set up incorrectly.  Fix it by moving the depth check at
the beginning of the loop.

Fixes: 1f578250 ("ALSA: hda - Add chained_before flag to the fixup entry")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 2fd23293
...@@ -824,6 +824,8 @@ static void apply_fixup(struct hda_codec *codec, int id, int action, int depth) ...@@ -824,6 +824,8 @@ static void apply_fixup(struct hda_codec *codec, int id, int action, int depth)
while (id >= 0) { while (id >= 0) {
const struct hda_fixup *fix = codec->fixup_list + id; const struct hda_fixup *fix = codec->fixup_list + id;
if (++depth > 10)
break;
if (fix->chained_before) if (fix->chained_before)
apply_fixup(codec, fix->chain_id, action, depth + 1); apply_fixup(codec, fix->chain_id, action, depth + 1);
...@@ -863,8 +865,6 @@ static void apply_fixup(struct hda_codec *codec, int id, int action, int depth) ...@@ -863,8 +865,6 @@ static void apply_fixup(struct hda_codec *codec, int id, int action, int depth)
} }
if (!fix->chained || fix->chained_before) if (!fix->chained || fix->chained_before)
break; break;
if (++depth > 10)
break;
id = fix->chain_id; id = fix->chain_id;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment