summaryrefslogtreecommitdiff
path: root/net/unix/af_unix.c
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2016-03-22 18:02:52 +0100
committerMin Chong <mchong@google.com>2016-07-11 17:36:47 -0700
commit9cb6c482ae8032970efe10f6f15d3bbee7795fb4 (patch)
tree504a838368f54eb16537343667997055af83dd22 /net/unix/af_unix.c
parent96f61ff98aab275e0ac7dae4a42d3357e3d6e4a2 (diff)
UPSTREAM: netfilter: x_tables: fix unconditional helper
(cherry pick from commit 54d83fc74aa9ec72794373cb47432c5f7fb1a309) Ben Hawkes says: In the mark_source_chains function (net/ipv4/netfilter/ip_tables.c) it is possible for a user-supplied ipt_entry structure to have a large next_offset field. This field is not bounds checked prior to writing a counter value at the supplied offset. Problem is that mark_source_chains should not have been called -- the rule doesn't have a next entry, so its supposed to return an absolute verdict of either ACCEPT or DROP. However, the function conditional() doesn't work as the name implies. It only checks that the rule is using wildcard address matching. However, an unconditional rule must also not be using any matches (no -m args). The underflow validator only checked the addresses, therefore passing the 'unconditional absolute verdict' test, while mark_source_chains also tested for presence of matches, and thus proceeeded to the next (not-existent) rule. Unify this so that all the callers have same idea of 'unconditional rule'. Reported-by: Ben Hawkes <hawkes@google.com> Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Change-Id: I47ec0713ac563ac244200c7b2c54f09a91aceabc Bug: 28940694
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions