packages: kernel/kernel-CVE-2011-1581.patch (NEW) - patch fixing CVE-2011-1...

[marti]

Author: marti                        Date: Wed Jul 20 14:06:15 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- patch fixing CVE-2011-1581
- source info: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fd0e435b0fe85622f167b84432552885a4856ac8

---- Files affected:
packages/kernel:
   kernel-CVE-2011-1581.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kernel/kernel-CVE-2011-1581.patch
diff -u /dev/null packages/kernel/kernel-CVE-2011-1581.patch:1.1
--- /dev/null	Wed Jul 20 16:06:15 2011
+++ packages/kernel/kernel-CVE-2011-1581.patch	Wed Jul 20 16:06:10 2011
@@ -0,0 +1,25 @@
+diff -ur linux-2.6.38-orig/drivers/net/bonding/bond_main.c linux-2.6.38/drivers/net/bonding/bond_main.c
+--- linux-2.6.38-orig/drivers/net/bonding/bond_main.c	2011-07-20 12:39:13.000000000 +0200
++++ linux-2.6.38/drivers/net/bonding/bond_main.c	2011-07-20 13:05:49.000000000 +0200
+@@ -4531,11 +4531,19 @@
+ {
+ 	/*
+ 	 * This helper function exists to help dev_pick_tx get the correct
+-	 * destination queue.  Using a helper function skips the a call to
++	 * destination queue.  Using a helper function skips a call to
+ 	 * skb_tx_hash and will put the skbs in the queue we expect on their
+ 	 * way down to the bonding driver.
+ 	 */
+ 	return skb->queue_mapping;
++	u16 txq = skb_rx_queue_recorded(skb) ? skb_get_rx_queue(skb) : 0;
++	
++	if (unlikely(txq >= dev->real_num_tx_queues)) {
++	        do
++	                txq -= dev->real_num_tx_queues;
++	        while (txq >= dev->real_num_tx_queues);
++	}
++	return txq;
+ }
+ 
+ static netdev_tx_t bond_start_xmit(struct sk_buff *skb, struct net_device *dev)
+Only in linux-2.6.38/drivers/net/bonding: bond_main.c~
================================================================