linux-kernel - [PATCH v2 3/3] ALSA: rme9652: don't disable if not enabled

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20210320222337.243368-4-ztong0001@gmail.com>
Date:   Sat, 20 Mar 2021 18:23:36 -0400
From:   Tong Zhang <ztong0001@...il.com>
To:     Jaroslav Kysela <perex@...ex.cz>, Takashi Iwai <tiwai@...e.com>,
        Romain Perier <romain.perier@...il.com>,
        Allen Pais <allen.lkml@...il.com>,
        Leon Romanovsky <leon@...nel.org>,
        Jasmin Fazlic <superfassl@...il.com>,
        Tong Zhang <ztong0001@...il.com>,
        Mark Brown <broonie@...nel.org>, Joe Perches <joe@...ches.com>,
        Tom Rix <trix@...hat.com>,
        Pierre-Louis Bossart <pierre-louis.bossart@...ux.intel.com>,
        "Gustavo A. R. Silva" <gustavoars@...nel.org>,
        alsa-devel@...a-project.org, linux-kernel@...r.kernel.org,
        Naoki Hayama <naoki.hayama@...eo.co.jp>
Subject: [PATCH v2 3/3] ALSA: rme9652: don't disable if not enabled

rme9652 wants to disable a not enabled pci device, which makes kernel
throw a warning. Make sure the device is enabled before calling disable.

[    1.751595] snd_rme9652 0000:00:03.0: disabling already-disabled device
[    1.751605] WARNING: CPU: 0 PID: 174 at drivers/pci/pci.c:2146 pci_disable_device+0x91/0xb0
[    1.759968] Call Trace:
[    1.760145]  snd_rme9652_card_free+0x76/0xa0 [snd_rme9652]
[    1.760434]  release_card_device+0x4b/0x80 [snd]
[    1.760679]  device_release+0x3b/0xa0
[    1.760874]  kobject_put+0x94/0x1b0
[    1.761059]  put_device+0x13/0x20
[    1.761235]  snd_card_free+0x61/0x90 [snd]
[    1.761454]  snd_rme9652_probe+0x3be/0x700 [snd_rme9652]

Signed-off-by: Tong Zhang <ztong0001@...il.com>
---
 sound/pci/rme9652/rme9652.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c
index 4df992e846f2..f9c9b8a80797 100644
--- a/sound/pci/rme9652/rme9652.c
+++ b/sound/pci/rme9652/rme9652.c
@@ -1728,10 +1728,10 @@ static int snd_rme9652_free(struct snd_rme9652 *rme9652)
 	if (rme9652->irq >= 0)
 		free_irq(rme9652->irq, (void *)rme9652);
 	iounmap(rme9652->iobase);
-	if (rme9652->port)
+	if (rme9652->port) {
 		pci_release_regions(rme9652->pci);
-
-	pci_disable_device(rme9652->pci);
+		pci_disable_device(rme9652->pci);
+  }
 	return 0;
 }
 
@@ -2454,8 +2454,10 @@ static int snd_rme9652_create(struct snd_card *card,
 
 	spin_lock_init(&rme9652->lock);
 
-	if ((err = pci_request_regions(pci, "rme9652")) < 0)
+	if ((err = pci_request_regions(pci, "rme9652")) < 0) {
+		pci_disable_device(pci);
 		return err;
+	}
 	rme9652->port = pci_resource_start(pci, 0);
 	rme9652->iobase = ioremap(rme9652->port, RME9652_IO_EXTENT);
 	if (rme9652->iobase == NULL) {
-- 
2.25.1