diff options
author | Andrey Konovalov <andreyknvl@google.com> | 2017-03-29 10:11:22 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-03 11:36:35 -0400 |
commit | 1f49c8cd2c9a53ea04bd86bce01247415d12aa26 (patch) | |
tree | e3d0a39967c24055f31a11de2682b37119dd80c8 /net | |
parent | 10452124bac39411e92fc8910dd418648bbb78ac (diff) |
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')
-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 e064e3342825..cb76ff3088e9 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c | |||
@@ -3702,6 +3702,8 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv | |||
3702 | return -EBUSY; | 3702 | return -EBUSY; |
3703 | if (copy_from_user(&val, optval, sizeof(val))) | 3703 | if (copy_from_user(&val, optval, sizeof(val))) |
3704 | return -EFAULT; | 3704 | return -EFAULT; |
3705 | if (val > INT_MAX) | ||
3706 | return -EINVAL; | ||
3705 | po->tp_reserve = val; | 3707 | po->tp_reserve = val; |
3706 | return 0; | 3708 | return 0; |
3707 | } | 3709 | } |