diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-27 04:39:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-27 04:39:08 +0200 |
| commit | b1513c35317c106a1588f3ab32f6888f0e2afd71 (patch) | |
| tree | b2cd68a0d34dd04eb89fcf28e173e5ee22f898fd /net/packet | |
| parent | virtio-net: on tx, only call napi_disable if tx napi is on (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff) | |
| download | linux-b1513c35317c106a1588f3ab32f6888f0e2afd71.tar.xz linux-b1513c35317c106a1588f3ab32f6888f0e2afd71.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/packet')
| -rw-r--r-- | net/packet/af_packet.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 94052f42058b..f4001763134d 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3880,6 +3880,8 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, case PACKET_HDRLEN: if (len > sizeof(int)) len = sizeof(int); + if (len < sizeof(int)) + return -EINVAL; if (copy_from_user(&val, optval, len)) return -EFAULT; switch (val) { |