diff options
| author | Sasha Levin <alexander.levin@verizon.com> | 2016-08-06 12:55:50 -0400 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-08-07 21:47:34 -0400 |
| commit | 1a012d587c7216cccea340774d3914a71c689e5b (patch) | |
| tree | 2f26ca068159dcef6d31da08c87c8bd6ab3a6d86 /sound | |
| parent | 943e282c64a7f664c3720f504ca70043807696e0 (diff) | |
| download | lwn-1a012d587c7216cccea340774d3914a71c689e5b.tar.gz lwn-1a012d587c7216cccea340774d3914a71c689e5b.zip | |
ALSA: hda - fix use-after-free after module unload
[ Upstream commit ab58d8cc870ef3f0771c197700441936898d1f1d ]
register_vga_switcheroo() sets the PM ops from the hda structure which
is freed later in azx_free. Make sure that these ops are cleared.
Caught by KASAN, initially noticed due to a general protection fault.
Fixes: 246efa4a072f ("snd/hda: add runtime suspend/resume on optimus support (v4)")
Signed-off-by: Peter Wu <peter@lekensteyn.nl>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 58f82733c893..392364e81c5f 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1119,8 +1119,10 @@ static int azx_free(struct azx *chip) if (use_vga_switcheroo(hda)) { if (chip->disabled && chip->bus) snd_hda_unlock_devices(chip->bus); - if (hda->vga_switcheroo_registered) + if (hda->vga_switcheroo_registered) { vga_switcheroo_unregister_client(chip->pci); + vga_switcheroo_fini_domain_pm_ops(chip->card->dev); + } } if (chip->initialized) { |