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

[Ben Hutchings]

Author: benh
Date: Mon Jan 24 03:31:32 2011
New Revision: 16850

Log:
rt2x00: Fix memory leak after failing to insert RTS/CTS frame (Closes: #561890)

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/rt2x00-Fix-memleak-when-RTS-CTS-fails.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/27

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Mon Jan 24 02:43:26 2011	(r16849)
+++ dists/lenny/linux-2.6/debian/changelog	Mon Jan 24 03:31:32 2011	(r16850)
@@ -3,6 +3,8 @@
   [ Ben Hutchings ]
   * dm,md: Deal with merge_bvec_fn in component devices better
     (Closes: #604457)
+  * rt2x00: Fix memory leak after failing to insert RTS/CTS frame
+    (Closes: #561890)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 29 Nov 2010 02:01:24 +0000
 

Added: dists/lenny/linux-2.6/debian/patches/bugfix/all/rt2x00-Fix-memleak-when-RTS-CTS-fails.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/rt2x00-Fix-memleak-when-RTS-CTS-fails.patch	Mon Jan 24 03:31:32 2011	(r16850)
@@ -0,0 +1,31 @@
+From: Ivo van Doorn <ivdoorn at gmail.com>
+Date: Sun, 20 Jul 2008 18:03:58 +0200
+Subject: [PATCH] rt2x00: Fix memleak when RTS/CTS fails
+
+commit e7087a828f8714e464fff18d93618727530dfd89 upstream.
+
+When sending the RTS/CTS frame fails, we should
+free the skb buffer which was created.
+
+Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+[bwh: Adjust context for 2.6.26]
+---
+ drivers/net/wireless/rt2x00/rt2x00mac.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
+index 802ddba..591e0ed 100644
+--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
++++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
+@@ -69,6 +69,7 @@ static int rt2x00mac_tx_rts_cts(struct rt2x00_dev *rt2x00dev,
+ 	skbdesc->flags |= FRAME_DESC_DRIVER_GENERATED;
+ 
+ 	if (rt2x00dev->ops->lib->write_tx_data(rt2x00dev, queue, skb, control)) {
++		dev_kfree_skb_any(skb);
+ 		WARNING(rt2x00dev, "Failed to send RTS/CTS frame.\n");
+ 		return NETDEV_TX_BUSY;
+ 	}
+-- 
+1.7.2.3
+

Modified: dists/lenny/linux-2.6/debian/patches/series/27
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/27	Mon Jan 24 02:43:26 2011	(r16849)
+++ dists/lenny/linux-2.6/debian/patches/series/27	Mon Jan 24 03:31:32 2011	(r16850)
@@ -1,2 +1,3 @@
 + bugfix/all/md-deal-with-merge_bvec_fn-in-component-devices-bett.patch
 + bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch
++ bugfix/all/rt2x00-Fix-memleak-when-RTS-CTS-fails.patch