[kernel] r14396 - in dists/lenny-security/linux-2.6/debian: . patches/bugfix/all patches/series

[Dann Frazier]

Author: dannf
Date: Fri Oct 16 23:07:00 2009
New Revision: 14396

Log:
r8169: use hardware auto padding (CVE-2009-3613)

Added:
   dists/lenny-security/linux-2.6/debian/patches/bugfix/all/r8169-use-hardware-auto-padding.patch
Modified:
   dists/lenny-security/linux-2.6/debian/changelog
   dists/lenny-security/linux-2.6/debian/patches/series/19lenny1

Modified: dists/lenny-security/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny-security/linux-2.6/debian/changelog	Fri Oct 16 22:17:02 2009	(r14395)
+++ dists/lenny-security/linux-2.6/debian/changelog	Fri Oct 16 23:07:00 2009	(r14396)
@@ -16,6 +16,7 @@
     (CVE-2009-2910)
   * NFSv4: move iattr & verf attributes of struct nfsd4_open out of the
     union (CVE-2009-3286)
+  * r8169: use hardware auto padding (CVE-2009-3613)
 
  -- dann frazier <dannf at debian.org>  Tue, 15 Sep 2009 22:54:06 -0600
 

Added: dists/lenny-security/linux-2.6/debian/patches/bugfix/all/r8169-use-hardware-auto-padding.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny-security/linux-2.6/debian/patches/bugfix/all/r8169-use-hardware-auto-padding.patch	Fri Oct 16 23:07:00 2009	(r14396)
@@ -0,0 +1,39 @@
+commit 97d477a914b146e7e6722ded21afa79886ae8ccd
+Author: françois romieu <romieu at fr.zoreil.com>
+Date:   Sun Mar 15 01:09:54 2009 +0000
+
+    r8169: use hardware auto-padding.
+    
+    It shortens the code and fixes the current pci_unmap leak with
+    padded skb reported by Dave Jones.
+    
+    Signed-off-by: Francois Romieu <romieu at fr.zoreil.com>
+    Signed-off-by: David S. Miller <davem at davemloft.net>
+
+Adjusted to apply to Debian's 2.6.26 by dann frazier <dannf at debian.org>
+
+diff -urpN linux-source-2.6.26.orig/drivers/net/r8169.c linux-source-2.6.26/drivers/net/r8169.c
+--- linux-source-2.6.26.orig/drivers/net/r8169.c	2009-08-18 23:15:14.000000000 -0600
++++ linux-source-2.6.26/drivers/net/r8169.c	2009-10-16 16:21:15.000000000 -0600
+@@ -2565,13 +2565,6 @@ static int rtl8169_start_xmit(struct sk_
+ 		opts1 |= FirstFrag;
+ 	} else {
+ 		len = skb->len;
+-
+-		if (unlikely(len < ETH_ZLEN)) {
+-			if (skb_padto(skb, ETH_ZLEN))
+-				goto err_update_stats;
+-			len = ETH_ZLEN;
+-		}
+-
+ 		opts1 |= FirstFrag | LastFrag;
+ 		tp->tx_skb[entry].skb = skb;
+ 	}
+@@ -2609,7 +2602,6 @@ out:
+ err_stop:
+ 	netif_stop_queue(dev);
+ 	ret = NETDEV_TX_BUSY;
+-err_update_stats:
+ 	dev->stats.tx_dropped++;
+ 	goto out;
+ }

Modified: dists/lenny-security/linux-2.6/debian/patches/series/19lenny1
==============================================================================
--- dists/lenny-security/linux-2.6/debian/patches/series/19lenny1	Fri Oct 16 22:17:02 2009	(r14395)
+++ dists/lenny-security/linux-2.6/debian/patches/series/19lenny1	Fri Oct 16 23:07:00 2009	(r14396)
@@ -17,3 +17,4 @@
 + bugfix/x86/x86-64-slightly-stream-line-32-bit-syscall-entry-code.patch
 + bugfix/x86/don-t-leak-64-bit-kernel-register-values-to-32-bit-processes.patch
 + bugfix/all/nfsd4-de-union-iattr-and-verf.patch
++ bugfix/all/r8169-use-hardware-auto-padding.patch