From 1f9ed591d220b1185ebed1e393c65c58ef165428 Mon Sep 17 00:00:00 2001
From: Nishank Trivedi <nistrive@cisco.com>
Date: Wed, 12 Sep 2012 13:32:49 +0000
Subject: [PATCH] --- yaml --- r: 322813 b: refs/heads/master c:
 6af773e786ad617b0264ebe06ba60675c01f3e51 h: refs/heads/master i:   322811:
 8055a63f4ed12eeb53489a2dc0665649bced99fe v: v3

---
 [refs]                  | 2 +-
 trunk/net/core/pktgen.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 133d24267b40..9a0747ea14a1 100644
--- 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
index cce9e53528b1..148e73d2c451 100644
--- 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);