Skip to content
Snippets Groups Projects
Commit 06eff2ac authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Stuart Scott
Browse files

UPSTREAM: 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.

Bug: 36725304
Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
(cherry picked from commit bcc5364bdcfe131e6379363f089e7b4108d35b70)

Change-Id: I17af0b50ea5b1caa8349e216b88ef57f5287de3c
parent f2153ad8
Branches
Tags
No related merge requests found
...@@ -3178,6 +3178,8 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv ...@@ -3178,6 +3178,8 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv
return -EBUSY; return -EBUSY;
if (copy_from_user(&val, optval, sizeof(val))) if (copy_from_user(&val, optval, sizeof(val)))
return -EFAULT; return -EFAULT;
if (val > INT_MAX)
return -EINVAL;
po->tp_reserve = val; po->tp_reserve = val;
return 0; return 0;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment