[patch] pcmcia-cs-3.2.8-orinoco-memleak.patch

pcmcia-cs-3.2.8-orinoco-memleak.patch (text/plain), 1.17 KB, created by Henrik Brix Andersen on 2005-12-18 05:13:08 UTC

diff -urp pcmcia-cs-3.2.8/wireless/orinoco.c pcmcia-cs-3.2.8-orinoco-memleak/wireless/orinoco.c
--- pcmcia-cs-3.2.8/wireless/orinoco.c	2004-04-09 05:55:09.000000000 +0200
+++ pcmcia-cs-3.2.8-orinoco-memleak/wireless/orinoco.c	2005-12-18 14:08:29.000000000 +0100
@@ -2362,9 +2362,14 @@ orinoco_xmit(struct sk_buff *skb, struct
 		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;
 
@@ -2414,8 +2419,7 @@ orinoco_xmit(struct sk_buff *skb, struct
 		p = skb->data;
 	}
 
-	/* Round up for odd length packets */
-	err = hermes_bap_pwrite(hw, USER_BAP, p, RUP_EVEN(data_len), txfid, data_off);
+	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",
 		       dev->name, err);
Only in pcmcia-cs-3.2.8-orinoco-memleak/wireless: orinoco.c~