---

yaml --- r: 333999 b: refs/heads/master c: 5aa8b57 h: refs/heads/master i: 333997: a74f70a 333995: d34958a 333991: 2d91e85 333983: 53ea32d v: v3
git-mirror · Oct 11, 2012 · 404ea3b · 404ea3b
1 parent 5c67a8e
commit 404ea3b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85457685e0e314f6902caaef976b3fd8ef4f51b4
+refs/heads/master: 5aa8b572007c4bca1e6d3dd4c4820f1ae49d6bb2
diff --git a/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c
@@ -2927,7 +2927,7 @@ static struct sk_buff *fill_packet_ipv6(struct net_device *odev,
 		  sizeof(struct ipv6hdr) - sizeof(struct udphdr) -
 		  pkt_dev->pkt_overhead;
 
-	if (datalen < sizeof(struct pktgen_hdr)) {
+	if (datalen < 0 || datalen < sizeof(struct pktgen_hdr)) {
 		datalen = sizeof(struct pktgen_hdr);
 		net_info_ratelimited("increased datalen to %d\n", datalen);
 	}