diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2018-03-13 21:58:39 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-03-13 20:25:26 -0400 |
| commit | a870a02cc963de35452bbed932560ed69725c4f2 (patch) | |
| tree | d3623f2998c7f30116ddac3de20724ff341a45bc /net/core | |
| parent | net: fix sysctl_fb_tunnels_only_for_init_net link error (diff) | |
| download | linux-dev-a870a02cc963de35452bbed932560ed69725c4f2.tar.xz linux-dev-a870a02cc963de35452bbed932560ed69725c4f2.zip | |
pktgen: use dynamic allocation for debug print buffer
After the removal of the VLA, we get a harmless warning about a large
stack frame:
net/core/pktgen.c: In function 'pktgen_if_write':
net/core/pktgen.c:1710:1: error: the frame size of 1076 bytes is larger than 1024 bytes [-Werror=frame-larger-than=]
The function was previously shown to be safe despite hitting
the 1024 bye warning level. To get rid of the annoyging warning,
while keeping it readable, this changes it to use strndup_user().
Obviously this is not a fast path, so the kmalloc() overhead
can be disregarded.
Fixes: 35951393bbff ("pktgen: Remove VLA usage")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/pktgen.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index e2d6ae3b290b..fd65761e1fed 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -906,13 +906,14 @@ static ssize_t pktgen_if_write(struct file *file, i += len; if (debug) { - size_t copy = min_t(size_t, count, 1023); - char tb[1024]; - if (copy_from_user(tb, user_buffer, copy)) - return -EFAULT; - tb[copy] = 0; - pr_debug("%s,%lu buffer -:%s:-\n", - name, (unsigned long)count, tb); + size_t copy = min_t(size_t, count + 1, 1024); + char *tp = strndup_user(user_buffer, copy); + + if (IS_ERR(tp)) + return PTR_ERR(tp); + + pr_debug("%s,%zu buffer -:%s:-\n", name, count, tp); + kfree(buf); } if (!strcmp(name, "min_pkt_size")) { |