28 lines
867 B
Diff
28 lines
867 B
Diff
From: Andrey Konovalov <andreyknvl@google.com>
|
|
Date: Wed, 29 Mar 2017 16:11:22 +0200
|
|
Subject: net/packet: fix overflow in check for tp_reserve
|
|
Origin: https://patchwork.ozlabs.org/patch/744813/
|
|
Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-7308
|
|
|
|
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>
|
|
---
|
|
net/packet/af_packet.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
--- a/net/packet/af_packet.c
|
|
+++ b/net/packet/af_packet.c
|
|
@@ -3702,6 +3702,8 @@ packet_setsockopt(struct socket *sock, i
|
|
return -EBUSY;
|
|
if (copy_from_user(&val, optval, sizeof(val)))
|
|
return -EFAULT;
|
|
+ if (val > INT_MAX)
|
|
+ return -EINVAL;
|
|
po->tp_reserve = val;
|
|
return 0;
|
|
}
|