netfilter: x_tables: check for bogus target offset
authorFlorian Westphal <fw@strlen.de>
Fri, 1 Apr 2016 12:17:28 +0000 (14:17 +0200)
committerJiri Slaby <jslaby@suse.cz>
Thu, 21 Jul 2016 06:35:43 +0000 (08:35 +0200)
commit1812c704ac70a37c06f239d7c06fd4331a25c779
treec89e5feaad3e98c052920e8fc91e7027fbb85dd2
parentcaa0e0bfbda8c8e38dec7a907b6365014e0e5659
netfilter: x_tables: check for bogus target offset

commit ce683e5f9d045e5d67d1312a42b359cb2ab2a13c upstream.

We're currently asserting that targetoff + targetsize <= nextoff.

Extend it to also check that targetoff is >= sizeof(xt_entry).
Since this is generic code, add an argument pointing to the start of the
match/target, we can then derive the base structure size from the delta.

We also need the e->elems pointer in a followup change to validate matches.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
include/linux/netfilter/x_tables.h
net/ipv4/netfilter/arp_tables.c
net/ipv4/netfilter/ip_tables.c
net/ipv6/netfilter/ip6_tables.c
net/netfilter/x_tables.c