diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-08-29 09:52:02 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-08-29 14:40:07 +0200 |
| commit | 333f31436d3db19f4286f8862a00ea1d8d8420a1 (patch) | |
| tree | 9f9871139f59e2d4c634411bc6283e8d8a5a3eb7 /sound/pci | |
| parent | 2fd2329393658514db074abd4f7dea8da1c20f81 (diff) | |
| download | linux-333f31436d3db19f4286f8862a00ea1d8d8420a1.tar.bz2 | |
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: 1f57825077dc ("ALSA: hda - Add chained_before flag to the fixup entry")
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/hda_auto_parser.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c index 92390d457567..18e6546b4467 100644 --- a/sound/pci/hda/hda_auto_parser.c +++ b/sound/pci/hda/hda_auto_parser.c @@ -824,6 +824,8 @@ static void apply_fixup(struct hda_codec *codec, int id, int action, int depth) while (id >= 0) { const struct hda_fixup *fix = codec->fixup_list + id; + if (++depth > 10) + break; if (fix->chained_before) 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) } if (!fix->chained || fix->chained_before) break; - if (++depth > 10) - break; id = fix->chain_id; } } |