diff options
| author | Andrey Konovalov <andreyknvl@google.com> | 2017-03-29 16:11:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-08 07:44:08 +0200 |
| commit | fe6fe14f1158bbcf4a07240cb93925e84ef25e89 (patch) | |
| tree | 977fc22800948e987a0286f6bc4471f0099ae8ec /net/packet/af_packet.c | |
| parent | 3e77cacaae604cd127642869381a87774880afb6 (diff) | |
| download | linux-rt-fe6fe14f1158bbcf4a07240cb93925e84ef25e89.tar.gz | |
net/packet: fix overflow in check for tp_reserve
[ Upstream commit bcc5364bdcfe131e6379363f089e7b4108d35b70 ]
When calculating po->tp_hdrlen + po->tp_reserve the result can overflow.
Fix by checking that tp_reserve <= INT_MAX on assign.
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/packet/af_packet.c')
| -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 9c8021234481..05cfee756898 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3314,6 +3314,8 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv return -EBUSY; if (copy_from_user(&val, optval, sizeof(val))) return -EFAULT; + if (val > INT_MAX) + return -EINVAL; po->tp_reserve = val; return 0; } |