Fix memory leak, bug #113322.

(Portage version: 2.0.51.22-r3)

5 files changed, 48 insertions, 6 deletions

diff --git a/net-wireless/orinoco/ChangeLog b/net-wireless/orinoco/ChangeLog
index 26eb5c1e6fcf..31dc102fe377 100644
--- a/net-wireless/orinoco/ChangeLog
+++ b/net-wireless/orinoco/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/orinoco
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/orinoco/ChangeLog,v 1.10 2005/11/27 18:54:04 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/orinoco/ChangeLog,v 1.11 2005/11/27 22:36:37 brix Exp $
+
+*orinoco-0.15_rc3-r1 (27 Nov 2005)
+
+  27 Nov 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/orinoco-0.15rc3-memleak.patch, -orinoco-0.15_rc3.ebuild,
+  +orinoco-0.15_rc3-r1.ebuild:
+  Fix memory leak, bug #113322.
 
 *orinoco-9999 (27 Nov 2005)
 
diff --git a/net-wireless/orinoco/Manifest b/net-wireless/orinoco/Manifest
index a3613245d731..cc454166856d 100644
--- a/net-wireless/orinoco/Manifest
+++ b/net-wireless/orinoco/Manifest
@@ -1,10 +1,11 @@
 MD5 e93a03c1e5af887a9761d23b158ac188 orinoco-0.15_rc2-r2.ebuild 2714
+MD5 9e927c2c698ea75f01bc726eb7d1f248 orinoco-0.15_rc3-r1.ebuild 2749
 MD5 2dcf417baad1b0902f857d2fba5527cf orinoco-9999.ebuild 2978
-MD5 2f624037b7bc5ee8ee9f70243ce2a173 orinoco-0.15_rc3.ebuild 2794
-MD5 ca3d9bb94d64675d000e4dae8da25708 ChangeLog 1717
+MD5 500cc07e3d8d1d4b35541b1956777da0 ChangeLog 1937
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 1082bcf4c903a8ad9783910524fc419c files/digest-orinoco-0.15_rc2-r2 66
+MD5 7c8b7df86c967166eb696662418f8e6a files/digest-orinoco-0.15_rc3-r1 66
 MD5 f9ce2c15dccfbc14bdb019da42885031 files/orinoco-0.15rc2-firmware.patch 606
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-orinoco-9999 0
+MD5 05e38fad13b920f1e776939a0ecf0e09 files/orinoco-0.15rc3-memleak.patch 1044
 MD5 26ab41e4c9fbbdbf80de660b20e9f233 files/orinoco-0.15rc2-2.6.10.patch 2755
-MD5 7c8b7df86c967166eb696662418f8e6a files/digest-orinoco-0.15_rc3 66
diff --git a/net-wireless/orinoco/files/digest-orinoco-0.15_rc3 b/net-wireless/orinoco/files/digest-orinoco-0.15_rc3-r1
index f2c8e9a4dd62..f2c8e9a4dd62 100644
--- a/net-wireless/orinoco/files/digest-orinoco-0.15_rc3
+++ b/net-wireless/orinoco/files/digest-orinoco-0.15_rc3-r1
diff --git a/net-wireless/orinoco/files/orinoco-0.15rc3-memleak.patch b/net-wireless/orinoco/files/orinoco-0.15rc3-memleak.patch
new file mode 100644
index 000000000000..93c0f1f3a2e7
--- /dev/null
+++ b/net-wireless/orinoco/files/orinoco-0.15rc3-memleak.patch
@@ -0,0 +1,31 @@
+diff -urp orinoco-0.15rc3/orinoco.c orinoco-0.15rc3-memleak/orinoco.c
+--- orinoco-0.15rc3/orinoco.c	2005-09-22 00:16:05.000000000 +0200
++++ orinoco-0.15rc3-memleak/orinoco.c	2005-11-27 23:30:28.000000000 +0100
+@@ -489,9 +489,14 @@ static int orinoco_xmit(struct sk_buff *
+ 		return 0;
+ 	}
+ 
+-	/* Length of the packet body */
+-	/* FIXME: what if the skb is smaller than this? */
+-	len = max_t(int,skb->len - ETH_HLEN, ETH_ZLEN - ETH_HLEN);
++	/* Check packet length, pad short packets, round up odd length */
++	len = max_t(int, ALIGN(skb->len, 2), ETH_ZLEN);
++	if (skb->len < len) {
++		skb = skb_padto(skb, len);
++		if (skb == NULL)
++			goto fail;
++	}
++	len -= ETH_HLEN;
+ 
+ 	eh = (struct ethhdr *)skb->data;
+ 
+@@ -543,8 +548,7 @@ static int orinoco_xmit(struct sk_buff *
+ 		p = skb->data;
+ 	}
+ 
+-	/* Round up for odd length packets */
+-	err = hermes_bap_pwrite(hw, USER_BAP, p, ALIGN(data_len, 2),
++	err = hermes_bap_pwrite(hw, USER_BAP, p, data_len,
+ 				txfid, data_off);
+ 	if (err) {
+ 		printk(KERN_ERR "%s: Error %d writing packet to BAP\n",
diff --git a/net-wireless/orinoco/orinoco-0.15_rc3.ebuild b/net-wireless/orinoco/orinoco-0.15_rc3-r1.ebuild
index 52e1cd582367..0df13b80424e 100644
--- a/net-wireless/orinoco/orinoco-0.15_rc3.ebuild
+++ b/net-wireless/orinoco/orinoco-0.15_rc3-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/orinoco/orinoco-0.15_rc3.ebuild,v 1.1 2005/11/27 18:52:27 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/orinoco/orinoco-0.15_rc3-r1.ebuild,v 1.1 2005/11/27 22:36:37 brix Exp $
 
-inherit linux-mod
+inherit eutils linux-mod
 
 MY_P=${P/_/}
 S=${WORKDIR}/${MY_P}
@@ -74,6 +74,9 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
+	cd ${S}
+	epatch ${FILESDIR}/${MY_P}-memleak.patch
+
 	sed -i "s:^\(KERNEL_PATH\) =.*:\1 = ${KV_OUT_DIR}:" \
 		${S}/Makefile
 }