diff options
| author | Andrey Konovalov <andreyknvl@google.com> | 2017-03-29 16:11:22 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-06-05 21:13:54 +0100 |
| commit | 96053b293c69c636d8d34fc569ac81fbf1118658 (patch) | |
| tree | 61ca55850751bfa028902dddedcb31ebe190bbe9 | |
| parent | 1634172286550a62d8a0a98cf8bec5cd975fa09c (diff) | |
net/packet: fix overflow in check for tp_reserve
commit bcc5364bdcfe131e6379363f089e7b4108d35b70 upstream.
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: Ben Hutchings <ben@decadent.org.uk>
| -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 92d57aac9e95..e961773a4138 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3136,6 +3136,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; } |