]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
ALSA: hda - fix use-after-free after module unload
authorPeter Wu <peter@lekensteyn.nl>
Mon, 11 Jul 2016 17:51:06 +0000 (19:51 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 11 Jul 2016 18:07:46 +0000 (20:07 +0200)
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>
sound/pci/hda/hda_intel.c

index e320c44714b14430263da80bfa3cc3951b3d159a..7c9b06bf2896d240e611cd44a763af3338940081 100644 (file)
@@ -1218,8 +1218,10 @@ static int azx_free(struct azx *chip)
        if (use_vga_switcheroo(hda)) {
                if (chip->disabled && hda->probe_continued)
                        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 (bus->chip_init) {