Home » Mailing list archives » linux-kernel » 2008 » May » 13

[patch 30/37] r8169: fix oops in r8169_get_mac_version

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Greg KH <gregkh@...>
To: <linux-kernel@...>, <stable@...>
Cc: Justin Forbes <jmforbes@...>, Zwane Mwaikambo <zwane@...>, Theodore Ts'o <tytso@...>, Randy Dunlap <rdunlap@...>, Dave Jones <davej@...>, Chuck Wolber <chuckw@...>, Chris Wedgwood <reviews@...>, Michael Krufky <mkrufky@...>, Chuck Ebbert <cebbert@...>, Domenico Andreoli <cavokz@...>, <torvalds@...>, <akpm@...>, <alan@...>, Ivan Vecera <ivecera@...>, Francois Romieu <romieu@...>
Subject: [patch 30/37] r8169: fix oops in r8169_get_mac_version
Date: Tuesday, May 13, 2008 - 4:12 pm

2.6.25-stable review patch.  If anyone has any objections, please let us
know.

------------------
From: Ivan Vecera <ivecera@redhat.com>

commit 21e197f231343201368338603cb0909a13961bac upstream.

r8169_get_mac_version crashes when it meets an unknown MAC
due to tp->pci_dev not being set. Initialize it early.

Signed-off-by: Ivan Vecera <ivecera@redhat.com>
Acked-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 drivers/net/r8169.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1617,6 +1617,7 @@ rtl8169_init_one(struct pci_dev *pdev, c
 	SET_NETDEV_DEV(dev, &pdev->dev);
 	tp = netdev_priv(dev);
 	tp->dev = dev;
+	tp->pci_dev = pdev;
 	tp->msg_enable = netif_msg_init(debug.msg_enable, R8169_MSG_DEFAULT);
 
 	/* enable device (incl. PCI PM wakeup and hotplug setup) */
@@ -1777,7 +1778,6 @@ rtl8169_init_one(struct pci_dev *pdev, c
 #endif
 
 	tp->intr_mask = 0xffff;
-	tp->pci_dev = pdev;
 	tp->mmio_addr = ioaddr;
 	tp->align = cfg->align;
 	tp->hw_start = cfg->hw_start;

-- 
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[patch 00/37] 2.6.25.4 -stable review, Greg KH, (Tue May 13, 4:10 pm)
[patch 37/37] md: fix raid5 repair operations, Greg KH, (Tue May 13, 4:12 pm)
[patch 36/37] rtc: rtc_time_to_tm: use unsigned arithmetic, Greg KH, (Tue May 13, 4:12 pm)
[patch 35/37] SCSI: aha152x: fix init suspiciously returned ..., Greg KH, (Tue May 13, 4:12 pm)
[patch 34/37] SCSI: aha152x: Fix oops on module removal, Greg KH, (Tue May 13, 4:12 pm)
[patch 33/37] SCSI: libiscsi regression in 2.6.25: fix setti..., Greg KH, (Tue May 13, 4:12 pm)
[patch 32/37] SCSI: libiscsi regression in 2.6.25: fix nop t..., Greg KH, (Tue May 13, 4:12 pm)
[patch 31/37] SCSI: qla1280: Fix queue depth problem, Greg KH, (Tue May 13, 4:12 pm)
[patch 30/37] r8169: fix oops in r8169_get_mac_version, Greg KH, (Tue May 13, 4:12 pm)
[patch 29/37] r8169: fix past rtl_chip_info array size for u..., Greg KH, (Tue May 13, 4:12 pm)
[patch 28/37] USB: airprime: unlock mutex instead of trying ..., Greg KH, (Tue May 13, 4:12 pm)
[patch 27/37] sparc32: Dont twiddle PT_DTRACE in exec., Greg KH, (Tue May 13, 4:12 pm)
[patch 26/37] sparc: Fix debugger syscall restart interactio..., Greg KH, (Tue May 13, 4:12 pm)
[patch 25/37] sparc: Fix mremap address range validation., Greg KH, (Tue May 13, 4:12 pm)
Re: [patch 25/37] sparc: Fix mremap address range validation., Linus Torvalds, (Tue May 13, 4:28 pm)
Re: [patch 25/37] sparc: Fix mremap address range validation., David Miller, (Tue May 13, 9:03 pm)
Re: [patch 25/37] sparc: Fix mremap address range validation., Greg KH, (Tue May 13, 4:37 pm)
Re: [patch 25/37] sparc: Fix mremap address range validation., David Miller, (Tue May 13, 9:04 pm)
[patch 24/37] sparc: Fix ptrace() detach., Greg KH, (Tue May 13, 4:12 pm)
[patch 23/37] i2c-piix4: Blacklist two mainboards, Greg KH, (Tue May 13, 4:12 pm)
Hardware designt to prevent Damages... [WAS: [patch 23/37] i..., Michelle Konzack, (Wed May 14, 3:52 pm)
Re: Hardware designt to prevent Damages... [WAS: [patch 23/3..., Jean Delvare, (Thu May 15, 2:49 pm)
Re: Hardware designt to prevent Damages... [WAS: [patch 23/3..., Michelle Konzack, (Fri May 16, 11:22 am)
Re: Hardware designt to prevent Damages... [WAS: [patch 23/3..., linux-os (Dick Johnson), (Thu May 15, 1:57 pm)
Re: Hardware designt to prevent Damages... [WAS: [patch 23/3..., Michelle Konzack, (Fri May 16, 5:55 am)
[patch 22/37] x86: sysfs cpu?/topology is empty in 2.6.25 (3..., Greg KH, (Tue May 13, 4:12 pm)
Re: [patch 22/37] x86: sysfs cpu?/topology is empty in 2.6.2..., Vaidyanathan Srinivasan, (Thu May 15, 2:06 pm)
Re: [patch 22/37] x86: sysfs cpu?/topology is empty in 2.6.2..., Greg KH, (Thu May 15, 4:07 pm)
[patch 21/37] ata_piix: verify SIDPR access before enabling it, Greg KH, (Tue May 13, 4:12 pm)
[patch 20/37] {nfnetlink, ip, ip6}_queue: fix skb_over_panic..., Greg KH, (Tue May 13, 4:12 pm)
Re: [patch 20/37] {nfnetlink, ip, ip6}_queue: fix skb_over_p..., Arnaud Ebalard, (Tue May 13, 7:45 pm)
Re: [patch 20/37] {nfnetlink, ip, ip6}_queue: fix skb_over_p..., Greg KH, (Tue May 13, 6:06 pm)
Re: [patch 20/37] {nfnetlink, ip, ip6}_queue: fix skb_over_p..., Gustavo Guillermo Perez, (Wed May 14, 12:45 pm)
Re: [patch 20/37] {nfnetlink, ip, ip6}_queue: fix skb_over_p..., Patrick McHardy, (Wed May 14, 1:08 pm)
[patch 19/37] nf_conntrack: padding breaks conntrack hash on..., Greg KH, (Tue May 13, 4:12 pm)
[patch 18/37] x86: use defconfigs from x86/configs/*, Greg KH, (Tue May 13, 4:12 pm)
[patch 17/37] can: Fix can_send() handling on dev_queue_xmit..., Greg KH, (Tue May 13, 4:12 pm)
[patch 16/37] dccp: return -EINVAL on invalid feature length, Greg KH, (Tue May 13, 4:12 pm)
[patch 15/37] ipvs: fix oops in backup for fwmark conn templ..., Greg KH, (Tue May 13, 4:12 pm)
[patch 14/37] macvlan: Fix memleak on device removal/crash o..., Greg KH, (Tue May 13, 4:12 pm)
[patch 13/37] sch_htb: remove from event queue in htb_parent..., Greg KH, (Tue May 13, 4:12 pm)
[patch 12/37] serial: Fix sparc driver name strings., Greg KH, (Tue May 13, 4:11 pm)
[patch 11/37] SPARC64: Fix args to 64-bit sys_semctl() via s..., Greg KH, (Tue May 13, 4:11 pm)
[patch 10/37] sparc64: Fix wedged irq regression., Greg KH, (Tue May 13, 4:11 pm)
[patch 09/37] sparc64: Stop creating dummy root PCI host con..., Greg KH, (Tue May 13, 4:11 pm)
[patch 08/37] sparc: Fix fork/clone/vfork system call restart., Greg KH, (Tue May 13, 4:11 pm)
[patch 07/37] sparc: Fix SA_ONSTACK signal handling., Greg KH, (Tue May 13, 4:11 pm)
[patch 06/37] sparc: sunzilog uart order, Greg KH, (Tue May 13, 4:11 pm)
[patch 05/37] XFRM: AUDIT: Fix flowlabel text format ambibui..., Greg KH, (Tue May 13, 4:11 pm)
[patch 04/37] OHCI: fix regression upon awakening from hiber..., Greg KH, (Tue May 13, 4:11 pm)
[patch 03/37] serial: access after NULL check in uart_flush_..., Greg KH, (Tue May 13, 4:11 pm)
[patch 02/37] vt: fix canonical input in UTF-8 mode, Greg KH, (Tue May 13, 4:11 pm)
[patch 01/37] V4L/DVB (7473): PATCH for various Dibcom based..., Greg KH, (Tue May 13, 4:11 pm)
Re: [patch 01/37] V4L/DVB (7473): PATCH for various Dibcom b..., Michael Krufky, (Tue May 13, 9:27 pm)
Re: [patch 01/37] V4L/DVB (7473): PATCH for various Dibcom b..., Greg KH, (Tue May 13, 10:03 pm)
Re: [patch 01/37] V4L/DVB (7473): PATCH for various Dibcom b..., Michael Krufky, (Tue May 13, 10:34 pm)
Re: [patch 01/37] V4L/DVB (7473): PATCH for various Dibcom b..., Greg KH, (Tue May 13, 10:59 pm)