---

yaml --- r: 322813 b: refs/heads/master c: 6af773e h: refs/heads/master i: 322811: 8055a63 v: v3
git-mirror · Sep 13, 2012 · 1f9ed59 · 1f9ed59
1 parent 967c3ff
commit 1f9ed59
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: 7b5342d9026d537cbc01fd30b7cd9bac9b07b5ad
+refs/heads/master: 6af773e786ad617b0264ebe06ba60675c01f3e51
diff --git a/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c
@@ -2721,7 +2721,7 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev,
 	/* Eth + IPh + UDPh + mpls */
 	datalen = pkt_dev->cur_pkt_size - 14 - 20 - 8 -
 		  pkt_dev->pkt_overhead;
-	if (datalen < sizeof(struct pktgen_hdr))
+	if (datalen < 0 || datalen < sizeof(struct pktgen_hdr))
 		datalen = sizeof(struct pktgen_hdr);
 
 	udph->source = htons(pkt_dev->cur_udp_src);