diff options
| author | Nelson Elhage <nelhage@ksplice.com> | 2010-10-28 20:31:07 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-28 20:47:53 +0200 |
| commit | 448d7b5daf043d109df98e3e8f8deb165c2e8896 (patch) | |
| tree | 475844d92c01fae639bda19988ba1375272c857a | |
| parent | net: Limit socket I/O iovec total length to INT_MAX. (diff) | |
| download | linux-448d7b5daf043d109df98e3e8f8deb165c2e8896.tar.xz linux-448d7b5daf043d109df98e3e8f8deb165c2e8896.zip | |
pktgen: Limit how much data we copy onto the stack.
A program that accidentally writes too much data to the pktgen file can overflow
the kernel stack and oops the machine. This is only triggerable by root, so
there's no security issue, but it's still an unfortunate bug.
printk() won't print more than 1024 bytes in a single call, anyways, so let's
just never copy more than that much data. We're on a fairly shallow stack, so
that should be safe even with CONFIG_4KSTACKS.
Signed-off-by: Nelson Elhage <nelhage@ksplice.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/pktgen.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 679b797d06b1..fbce4b05a53e 100644 --- a/net/core/pktgen.c +++ b/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); } |