From: Jeff Garzik <jgarzik@pobox•com>
To: Maillist netdev <netdev@oss•sgi.com>
Subject: [Fwd: PATCH pktgen hang, memleak, fixes]
Date: Thu, 10 Jul 2003 13:40:53 -0400 [thread overview]
Message-ID: <3F0DA525.2080808@pobox.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: PATCH pktgen hang, memleak, fixes --]
[-- Type: message/rfc822, Size: 4914 bytes --]
From: "Kambo Lohan" <kambo77@hotmail•com>
To: linux-kernel@vger•kernel.org
Subject: PATCH pktgen hang, memleak, fixes
Date: Thu, 10 Jul 2003 11:22:24 -0400
Message-ID: <Sea2-F47vJo8jUbRX8z000320b1@hotmail•com>
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-2.4.21/net/core/pktgen.c 2002-11-28 18:53:15.000000000 -0500
+++ linux-2.4-kjp/net/core/pktgen.c 2003-07-10 11:08:31.000000000 -0400
@@ -34,6 +34,7 @@
* * The new changes seem to have a performance impact of around 1%,
* as far as I can tell.
* --Ben Greear <greearb@candelatech•com>
+ * Fix refcount off by one if first packet fails, potential null deref,
memleak 030710- KJP
*
* Renamed multiskb to clone_skb and cleaned up sending core for two
distinct
* skb modes. A clone_skb=0 mode for Ben "ranges" work and a clone_skb != 0
@@ -84,9 +85,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 */
@@ -613,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;
@@ -634,9 +634,10 @@
last_ok = 0;
}
else {
- last_ok = 1;
- info->sofar++;
- info->seq_num++;
+ atomic_inc(&skb->users);
+ last_ok = 1;
+ info->sofar++;
+ info->seq_num++;
}
}
else {
@@ -707,6 +708,7 @@
}
}/* while we should be running */
+
do_gettimeofday(&(info->stopped_at));
total = (info->stopped_at.tv_sec - info->started_at.tv_sec) * 1000000 +
@@ -731,6 +733,8 @@
(unsigned long long) info->errors
);
}
+
+ kfree_skb(skb);
out_reldev:
if (odev) {
_________________________________________________________________
STOP MORE SPAM with the new MSN 8 and get 2 months FREE*
http://join.msn.com/?page=features/junkmail
-
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/
reply other threads:[~2003-07-10 17:40 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3F0DA525.2080808@pobox.com \
--to=jgarzik@pobox$(echo .)com \
--cc=netdev@oss$(echo .)sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox