2 more .25 patches added

diff --git a/queue-2.6.25/r8169-fix-oops-in-r8169_get_mac_version.patch b/queue-2.6.25/r8169-fix-oops-in-r8169_get_mac_version.patch
new file mode 100644 (file)
index 0000000..afd27ae
--- /dev/null
+++ b/queue-2.6.25/r8169-fix-oops-in-r8169_get_mac_version.patch
@@ -0,0 +1,41 @@
+From romieu@fr.zoreil.com  Tue May 13 11:03:51 2008
+From: Ivan Vecera <ivecera@redhat.com>
+Date: Sun, 11 May 2008 11:00:53 +0200
+Subject: r8169: fix oops in r8169_get_mac_version
+To: stable@kernel.org
+Message-ID: <20080511090053.GA10766@electric-eye.fr.zoreil.com>
+Content-Disposition: inline
+
+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;

diff --git a/queue-2.6.25/r8169-fix-past-rtl_chip_info-array-size-for-unknown-chipsets.patch b/queue-2.6.25/r8169-fix-past-rtl_chip_info-array-size-for-unknown-chipsets.patch
new file mode 100644 (file)
index 0000000..f9558c5
--- /dev/null
+++ b/queue-2.6.25/r8169-fix-past-rtl_chip_info-array-size-for-unknown-chipsets.patch
@@ -0,0 +1,46 @@
+From romieu@fr.zoreil.com  Tue May 13 11:03:16 2008
+From: Roel Kluin <12o3l@tiscali.nl>
+Date: Sun, 11 May 2008 10:59:44 +0200
+Subject: r8169: fix past rtl_chip_info array size for unknown chipsets
+To: stable@kernel.org
+Message-ID: <20080511085944.GA10648@electric-eye.fr.zoreil.com>
+Content-Disposition: inline
+
+From: Roel Kluin <12o3l@tiscali.nl>
+
+commit cee60c377de6d9d10f0a2876794149bd79a15020 upstream.
+
+'i' is unsigned.
+
+Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
+Acked-by: Francois Romieu <romieu@fr.zoreil.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/net/r8169.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/net/r8169.c
++++ b/drivers/net/r8169.c
+@@ -1705,18 +1705,18 @@ rtl8169_init_one(struct pci_dev *pdev, c
+ 
+       rtl8169_print_mac_version(tp);
+ 
+-      for (i = ARRAY_SIZE(rtl_chip_info) - 1; i >= 0; i--) {
++      for (i = 0; i < ARRAY_SIZE(rtl_chip_info); i++) {
+               if (tp->mac_version == rtl_chip_info[i].mac_version)
+                       break;
+       }
+-      if (i < 0) {
++      if (i == ARRAY_SIZE(rtl_chip_info)) {
+               /* Unknown chip: assume array element #0, original RTL-8169 */
+               if (netif_msg_probe(tp)) {
+                       dev_printk(KERN_DEBUG, &pdev->dev,
+                               "unknown chip version, assuming %s\n",
+                               rtl_chip_info[0].name);
+               }
+-              i++;
++              i = 0;
+       }
+       tp->chipset = i;
+ 

diff --git a/queue-2.6.25/series b/queue-2.6.25/series
index 41fee2ce442880a2562c127fc31ffe5b595639b2..e2f860a443612820ace5eaa7da4dd7d7bdcfa972 100644 (file)
--- a/queue-2.6.25/series
+++ b/queue-2.6.25/series
@@ -26,3 +26,5 @@ sparc-fix-mremap-address-range-validation.patch
 sparc-fix-debugger-syscall-restart-interactions.patch
 sparc32-don-t-twiddle-pt_dtrace-in-exec.patch
 usb-airprime-unlock-mutex-instead-of-trying-to-lock-it-again.patch
+r8169-fix-past-rtl_chip_info-array-size-for-unknown-chipsets.patch
+r8169-fix-oops-in-r8169_get_mac_version.patch