]> www.infradead.org Git - users/jedix/linux-maple.git/commit
netfilter: x_tables: validate targets of jumps
authorFlorian Westphal <fw@strlen.de>
Fri, 1 Apr 2016 12:17:22 +0000 (14:17 +0200)
committerChuck Anderson <chuck.anderson@oracle.com>
Fri, 30 Sep 2016 06:05:06 +0000 (23:05 -0700)
commitc6f30cf06085ccc0a189a3c192b0a990c3f90ba3
tree205c4daeddf01e73730c8c7bdf24eae582353e19
parentfdcef5765627eeaec6cdc8097ac80caf809a5b77
netfilter: x_tables: validate targets of jumps

Orabug: 24690280
CVE: CVE-2016-3134

[ Upstream commit 36472341017529e2b12573093cc0f68719300997 ]

When we see a jump also check that the offset gets us to beginning of
a rule (an ipt_entry).

The extra overhead is negible, even with absurd cases.

300k custom rules, 300k jumps to 'next' user chain:
[ plus one jump from INPUT to first userchain ]:

Before:
real    0m24.874s
user    0m7.532s
sys     0m16.076s

After:
real    0m27.464s
user    0m7.436s
sys     0m18.840s

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit 8163327a3a927c36f7c032bb67957e6c0f4ec27d)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
net/ipv4/netfilter/arp_tables.c