| From bcc5364bdcfe131e6379363f089e7b4108d35b70 Mon Sep 17 00:00:00 2001 |
| From: Andrey Konovalov <andreyknvl@google.com> |
| Date: Wed, 29 Mar 2017 16:11:22 +0200 |
| Subject: [PATCH] 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> |
| |
| 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; |
| } |
| -- |
| 2.12.0 |
| |
