diff options
| author | Andrey Konovalov <andreyknvl@google.com> | 2017-03-29 16:11:22 +0200 |
|---|---|---|
| committer | Stuart Scott <stuartscott@google.com> | 2017-05-19 20:38:30 +0000 |
| commit | e853ff82832713ef49044e28b40b5e774632abb3 (patch) | |
| tree | 3709bc03a1435ba66a2fc9cd4d60751bb65fd168 | |
| parent | 69f5a950235b614cac7aee62f83abe004684f7c4 (diff) | |
| download | x86_64-e853ff82832713ef49044e28b40b5e774632abb3.tar.gz | |
UPSTREAM: net/packet: fix overflow in check for tp_reserve
When calculating po->tp_hdrlen + po->tp_reserve the result can overflow.
Fix by checking that tp_reserve <= INT_MAX on assign.
Bug: 36725304
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit bcc5364bdcfe131e6379363f089e7b4108d35b70)
Change-Id: I17af0b50ea5b1caa8349e216b88ef57f5287de3c
| -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 bc748caffdd5..d8f90dc91404 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3153,6 +3153,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; } |