[kernel] r15080 - in dists/etch-security/linux-2.6.24/debian: . patches/bugfix/all patches/series

[Dann Frazier]

Author: dannf
Date: Mon Feb  1 04:53:17 2010
New Revision: 15080

Log:
e1000: enhance frame fragment detection (CVE-2009-4536)

Added:
   dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/e1000-enhance-frame-fragment-detection.patch
      - copied, changed from r15068, dists/lenny-security/linux-2.6/debian/patches/bugfix/all/e1000-enhance-frame-fragment-detection.patch
Modified:
   dists/etch-security/linux-2.6.24/debian/changelog
   dists/etch-security/linux-2.6.24/debian/patches/series/6~etchnhalf.9etch2

Modified: dists/etch-security/linux-2.6.24/debian/changelog
==============================================================================
--- dists/etch-security/linux-2.6.24/debian/changelog	Mon Feb  1 04:46:57 2010	(r15079)
+++ dists/etch-security/linux-2.6.24/debian/changelog	Mon Feb  1 04:53:17 2010	(r15080)
@@ -16,6 +16,7 @@
     (CVE-2009-4138)
   * ext4: Avoid null pointer dereference when decoding EROFS w/o a journal
     (CVE-2009-4308)
+  * e1000: enhance frame fragment detection (CVE-2009-4536)
 
  -- dann frazier <dannf at debian.org>  Sun, 31 Jan 2010 17:17:52 -0700
 

Copied and modified: dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/e1000-enhance-frame-fragment-detection.patch (from r15068, dists/lenny-security/linux-2.6/debian/patches/bugfix/all/e1000-enhance-frame-fragment-detection.patch)
==============================================================================
--- dists/lenny-security/linux-2.6/debian/patches/bugfix/all/e1000-enhance-frame-fragment-detection.patch	Sun Jan 31 21:26:06 2010	(r15068, copy source)
+++ dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/e1000-enhance-frame-fragment-detection.patch	Mon Feb  1 04:53:17 2010	(r15080)
@@ -27,12 +27,24 @@
     Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
     Signed-off-by: David S. Miller <davem at davemloft.net>
 
-Backported to Debian's 2.6.26 by dann frazier <dannf at debian.org>
+Backported to Debian's 2.6.24 by dann frazier <dannf at debian.org>
 
-diff -urpN linux-source-2.6.26.orig/drivers/net/e1000/e1000_main.c linux-source-2.6.26/drivers/net/e1000/e1000_main.c
---- linux-source-2.6.26.orig/drivers/net/e1000/e1000_main.c	2009-12-26 01:14:56.000000000 -0700
-+++ linux-source-2.6.26/drivers/net/e1000/e1000_main.c	2010-01-22 15:43:22.000000000 -0700
-@@ -4241,13 +4241,22 @@ e1000_clean_rx_irq(struct e1000_adapter 
+diff -urpN linux-source-2.6.24.orig/drivers/net/e1000/e1000.h linux-source-2.6.24/drivers/net/e1000/e1000.h
+--- linux-source-2.6.24.orig/drivers/net/e1000/e1000.h	2008-01-24 15:58:37.000000000 -0700
++++ linux-source-2.6.24/drivers/net/e1000/e1000.h	2010-01-31 21:48:39.000000000 -0700
+@@ -343,6 +343,8 @@ struct e1000_adapter {
+ 	boolean_t quad_port_a;
+ 	unsigned long flags;
+ 	uint32_t eeprom_wol;
++
++	bool discarding;
+ };
+ 
+ enum e1000_state_t {
+diff -urpN linux-source-2.6.24.orig/drivers/net/e1000/e1000_main.c linux-source-2.6.24/drivers/net/e1000/e1000_main.c
+--- linux-source-2.6.24.orig/drivers/net/e1000/e1000_main.c	2009-11-04 18:42:05.000000000 -0700
++++ linux-source-2.6.24/drivers/net/e1000/e1000_main.c	2010-01-31 21:47:42.000000000 -0700
+@@ -4174,13 +4174,22 @@ e1000_clean_rx_irq(struct e1000_adapter 
  
  		length = le16_to_cpu(rx_desc->length);
  		/* !EOP means multiple descriptors were used to store a single
@@ -57,14 +69,3 @@
  			goto next_desc;
  		}
  
---- linux-source-2.6.26/drivers/net/e1000/e1000.h.orig	2008-07-13 15:51:29.000000000 -0600
-+++ linux-source-2.6.26/drivers/net/e1000/e1000.h	2010-01-26 09:55:11.000000000 -0700
-@@ -342,6 +342,8 @@ struct e1000_adapter {
- 	bool quad_port_a;
- 	unsigned long flags;
- 	u32 eeprom_wol;
-+
-+	bool discarding;
- };
- 
- enum e1000_state_t {

Modified: dists/etch-security/linux-2.6.24/debian/patches/series/6~etchnhalf.9etch2
==============================================================================
--- dists/etch-security/linux-2.6.24/debian/patches/series/6~etchnhalf.9etch2	Mon Feb  1 04:46:57 2010	(r15079)
+++ dists/etch-security/linux-2.6.24/debian/patches/series/6~etchnhalf.9etch2	Mon Feb  1 04:53:17 2010	(r15080)
@@ -13,3 +13,4 @@
 + bugfix/all/fuse-prevent-fuse_put_request-on-invalid-pointer.patch
 + bugfix/all/firewire-ohci-handle-receive-packets-with-a-data-length-of-zero.patch
 + bugfix/all/ext4-avoid-null-pointer-deref-when-decoding-EROFS-wo-a-journal.patch
++ bugfix/all/e1000-enhance-frame-fragment-detection.patch