Thanks!
It looks fine. Jeff cross-posted to netdev which is the appropriate list.
It goes for both 2.4 and 2.5 versions. We ask DaveM to apply.
Cheers.
--ro
Kambo Lohan writes:
> This should fix about 3 things. My first patch, be gentle...
>
> 2.5 has the same problem but I do not know if this will apply or not, we run
> 2.4.
--- linux/net/core/pktgen.c.orig Thu Jul 17 16:00:14 2003
+++ linux/net/core/pktgen.c Thu Jul 17 16:37:21 2003
@@ -47,6 +47,9 @@
* Also moved to /proc/net/pktgen/
* --ro
*
+ * Fix refcount off by one if first packet fails, potential null deref,
+ * memleak 030710- KJP
+ *
* See Documentation/networking/pktgen.txt for how to use this.
*/
@@ -85,9 +88,9 @@
#define cycles() ((u32)get_cycles())
-#define VERSION "pktgen version 1.2"
+#define VERSION "pktgen version 1.2.1"
static char version[] __initdata =
- "pktgen.c: v1.2: Packet Generator for packet performance testing.\n";
+ "pktgen.c: v1.2.1: Packet Generator for packet performance testing.\n";
/* Used to help with determining the pkts on receive */
@@ -611,12 +614,11 @@
kfree_skb(skb);
skb = fill_packet(odev, info);
if (skb == NULL) {
- break;
+ goto out_reldev;
}
fp++;
fp_tmp = 0; /* reset counter */
}
- atomic_inc(&skb->users);
}
nr_frags = skb_shinfo(skb)->nr_frags;
@@ -632,6 +634,7 @@
last_ok = 0;
}
else {
+ atomic_inc(&skb->users);
last_ok = 1;
info->sofar++;
info->seq_num++;
@@ -729,7 +732,9 @@
(unsigned long long) info->errors
);
}
-
+
+ kfree_skb(skb);
+
out_reldev:
if (odev) {
dev_put(odev);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Wed Jul 23 2003 - 22:00:37 EST