git.samba.org
/
sfrench
/
cifs-2.6.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
23b1097
)
netfilter: x_tables: assert minimum target size
author
Florian Westphal
<fw@strlen.de>
Fri, 1 Apr 2016 12:17:25 +0000
(14:17 +0200)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Fri, 24 Jun 2016 17:22:05 +0000
(10:22 -0700)
commit
a08e4e190b866579896c09af59b3bdca821da2cd
upstream.
The target size includes the size of the xt_entry_target struct.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/netfilter/x_tables.c
patch
|
blob
|
history
diff --git
a/net/netfilter/x_tables.c
b/net/netfilter/x_tables.c
index 1f44bfa8dd940eda9f14587cd95df7e633950035..ec1b7183fff964ca74d3051c07ca8685b90aa634 100644
(file)
--- a/
net/netfilter/x_tables.c
+++ b/
net/netfilter/x_tables.c
@@
-568,6
+568,9
@@
int xt_check_entry_offsets(const void *base,
return -EINVAL;
t = (void *)(e + target_offset);
+ if (t->u.target_size < sizeof(*t))
+ return -EINVAL;
+
if (target_offset + t->u.target_size > next_offset)
return -EINVAL;