diff options
| author | Andrey Konovalov <andreyknvl@google.com> | 2017-03-29 16:11:22 +0200 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2017-05-09 08:19:42 +0200 |
| commit | 915ff058627e270b93b3d398b4b0f2c42d27a362 (patch) | |
| tree | 4bd85c5a7677ccf1914ce618cabc1da061b298bb | |
| parent | 1bfb6e1bc972137a4aa7df3397d5e0fe90e13025 (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: Jiri Slaby <jslaby@suse.cz>
| -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 d6087b4359cc..2455f1b08ac3 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3167,6 +3167,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; } |