From: Stephen Hemminger <shemminger@linux-foundation.org>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: netdev@vger.kernel.org
Subject: [PATCH 1/4] sky2: fix oops on shutdown
Date: Fri, 11 May 2007 11:21:44 -0700 [thread overview]
Message-ID: <20070511182251.277113203@linux-foundation.org> (raw)
In-Reply-To: 20070511182143.872814956@linux-foundation.org
[-- Attachment #1: sky2-shutdown.patch --]
[-- Type: text/plain, Size: 1348 bytes --]
If the device is fails during module startup for some reason like
unsupported chip version then the driver would crash dereferencing a
null pointer, on shutdown or suspend/resume.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
---
drivers/net/sky2.c | 10 ++++++++++
1 file changed, 10 insertions(+)
--- sky2-2.6.21.orig/drivers/net/sky2.c 2007-05-10 10:27:48.000000000 -0700
+++ sky2-2.6.21/drivers/net/sky2.c 2007-05-10 11:29:17.000000000 -0700
@@ -3732,6 +3732,7 @@ err_out_free_regions:
err_out_disable:
pci_disable_device(pdev);
err_out:
+ pci_set_drvdata(pdev, NULL);
return err;
}
@@ -3784,6 +3785,9 @@ static int sky2_suspend(struct pci_dev *
struct sky2_hw *hw = pci_get_drvdata(pdev);
int i, wol = 0;
+ if (!hw)
+ return 0;
+
del_timer_sync(&hw->idle_timer);
netif_poll_disable(hw->dev[0]);
@@ -3815,6 +3819,9 @@ static int sky2_resume(struct pci_dev *p
struct sky2_hw *hw = pci_get_drvdata(pdev);
int i, err;
+ if (!hw)
+ return 0;
+
err = pci_set_power_state(pdev, PCI_D0);
if (err)
goto out;
@@ -3861,6 +3868,9 @@ static void sky2_shutdown(struct pci_dev
struct sky2_hw *hw = pci_get_drvdata(pdev);
int i, wol = 0;
+ if (!hw)
+ return;
+
del_timer_sync(&hw->idle_timer);
netif_poll_disable(hw->dev[0]);
--
Stephen Hemminger <shemminger@linux-foundation.org>
next prev parent reply other threads:[~2007-05-11 18:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-11 18:21 [PATCH 0/4] sky2/skge bug fix patches for 2.6.22 Stephen Hemminger
2007-05-11 18:21 ` Stephen Hemminger [this message]
2007-05-11 20:58 ` [PATCH 1/4] sky2: fix oops on shutdown Jeff Garzik
2007-05-11 18:21 ` [PATCH 2/4] skge: crash on shutdown/suspend Stephen Hemminger
2007-05-11 18:21 ` [PATCH 3/4] sky2: 88e8071 support not ready Stephen Hemminger
2007-05-11 18:21 ` [PATCH 4/4] sky2: only disable 88e8056 on some boards Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070511182251.277113203@linux-foundation.org \
--to=shemminger@linux-foundation.org \
--cc=jgarzik@pobox.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.