summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Konovalov <andreyknvl@google.com>2017-03-29 16:11:22 +0200
committerDavid S. Miller <davem@davemloft.net>2017-03-30 11:04:00 -0700
commitbcc5364bdcfe131e6379363f089e7b4108d35b70 (patch)
tree43e301600bc32c0bca913032b45b0f859600b8d1
parent8f8d28e4d6d815a391285e121c3a53a0b6cb9e7b (diff)
downloadtalos-obmc-linux-bcc5364bdcfe131e6379363f089e7b4108d35b70.tar.gz
talos-obmc-linux-bcc5364bdcfe131e6379363f089e7b4108d35b70.zip
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. Signed-off-by: Andrey Konovalov <andreyknvl@google.com> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/packet/af_packet.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 3ac286ebb2f4..8489beff5c25 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -3665,6 +3665,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;
}
OpenPOWER on IntegriCloud