mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
33 lines
1007 B
Diff
33 lines
1007 B
Diff
|
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: 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>
|
||
|
|
---
|
||
|
|
net/packet/af_packet.c | 2 ++
|
||
|
|
1 file changed, 2 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
|
||
|
|
index 3ac286e..8489bef 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;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
cgit v1.1
|
||
|
|
|