diff options
| author | Andrey Konovalov <andreyknvl@google.com> | 2017-03-29 16:11:22 +0200 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-06-13 09:29:18 -0400 |
| commit | cc09115fb0b9cecc1fffd881416aad0b0639adc3 (patch) | |
| tree | 6259b2ec3138adcb5d8acfc47bd960ff0a00ff49 /net/packet | |
| parent | fed853407cc28fff0db4e4976a80323fea39d183 (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: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'net/packet')
| -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 8d654fe78594..93c9a70d046e 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3374,6 +3374,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; } |