linux-kernel - [PATCH] fix parport_serial_pci_resume() ignoring return value from pci_enable

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-next>] [day] [month] [year] [list]

Date:	Fri, 13 Oct 2006 01:44:24 +0200 (CEST)
From:	Jiri Kosina <jikos@...os.cz>
To:	Phil Blundell <philb@....org>, Tim Waugh <tim@...erelk.net>,
	Andrew Morton <akpm@...l.org>
cc:	linux-kernel@...r.kernel.org, linux-parport@...ts.infradead.org
Subject: [PATCH] fix parport_serial_pci_resume() ignoring return value from
 pci_enable_device()

Fix parport_serial_pci_resume() ignoring return value from 
pci_enable_device(). 

(I guess that the parport_serial_pci_remove() is the right way(tm) to 
remove the device from the system in non-destructive way even in case 
pci_enable_device() failed. Tim?)

Signed-off-by: Jiri Kosina <jikos@...os.cz>

--- 

 drivers/parport/parport_serial.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index 78c0a26..ea76b5e 100644
--- a/drivers/parport/parport_serial.c
+++ b/drivers/parport/parport_serial.c
@@ -392,6 +392,7 @@ static int parport_serial_pci_suspend(st
 static int parport_serial_pci_resume(struct pci_dev *dev)
 {
 	struct parport_serial_private *priv = pci_get_drvdata(dev);
+	int err;
 
 	pci_set_power_state(dev, PCI_D0);
 	pci_restore_state(dev);
@@ -399,7 +400,14 @@ static int parport_serial_pci_resume(str
 	/*
 	 * The device may have been disabled.  Re-enable it.
 	 */
-	pci_enable_device(dev);
+	err = pci_enable_device(dev);
+	if (err) {
+		printk(KERN_ERR "parport: Cannot enable PCI device %s during resume\n", 
+				pci_name(dev));
+		parport_serial_pci_remove(dev);
+		return err;
+	}
+
 
 	if (priv->serial)
 		pciserial_resume_ports(priv->serial);

-- 
Jiri Kosina
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/