From fab3bf66b21da898b23e71c843e0d17f55970d86 Mon Sep 17 00:00:00 2001
From: Nelson Elhage <nelhage@ksplice.com>
Date: Thu, 28 Oct 2010 11:31:07 -0700
Subject: [PATCH] --- yaml --- r: 220951 b: refs/heads/master c:
 448d7b5daf043d109df98e3e8f8deb165c2e8896 h: refs/heads/master i:   220949:
 fa2ab4ce165dc1436c0abe777ff846d05f0bf4d2   220947:
 791e1f8a3ec53b6ca6e3bc9be86d4200865d97aa   220943:
 60e6af4836c3e0b6813b08647e9f08fbe87b9e7e v: v3

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

diff --git a/[refs] b/[refs]
index 5bdd4aeff9bc..8eafd55ff40d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8acfe468b0384e834a303f08ebc4953d72fb690a
+refs/heads/master: 448d7b5daf043d109df98e3e8f8deb165c2e8896
diff --git a/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c
index 679b797d06b1..fbce4b05a53e 100644
--- a/trunk/net/core/pktgen.c
+++ b/trunk/net/core/pktgen.c
@@ -887,10 +887,11 @@ static ssize_t pktgen_if_write(struct file *file,
 	i += len;
 
 	if (debug) {
-		char tb[count + 1];
-		if (copy_from_user(tb, user_buffer, count))
+		size_t copy = min(count, 1023);
+		char tb[copy + 1];
+		if (copy_from_user(tb, user_buffer, copy))
 			return -EFAULT;
-		tb[count] = 0;
+		tb[copy] = 0;
 		printk(KERN_DEBUG "pktgen: %s,%lu  buffer -:%s:-\n", name,
 		       (unsigned long)count, tb);
 	}