summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-04-04 21:23:15 +0200
committerDavid S. Miller <davem@davemloft.net>2015-04-04 21:23:15 +0200
commit5888b93b750609680735d6b8b737703083ef40ff (patch)
tree181f959eaf7d8084ff33f64d3356e3213c5f01bf /net/core
parenttest_rhashtable: Remove bogus max_size setting (diff)
parentnetfilter: Pass nf_hook_state through arpt_do_table(). (diff)
downloadlinux-5888b93b750609680735d6b8b737703083ef40ff.tar.xz
linux-5888b93b750609680735d6b8b737703083ef40ff.zip
Merge branch 'nf-hook-compress'
netfilter: Compress hook function signatures. Currently netfilter hooks have a function signature that is huge and has many arguments. This propagates from the hook entry points down into the individual hook implementations themselves. This means that if, for example, we want to change the type of one of these arguments then we have to touch hundreds of locations. The main initial motivation behind this is that we'd like to change the signature of "okfn" so that a socket pointer can be passed in (and reference counted properly) for the sake of using the proper socket context in the case of tunnels whilst not releasing the top level user socket from skb->sk (and thus releasing it's socket memory quota usage) in order to accomodate this. This also makes it clear who actually uses 'okfn', nf_queue(). It is absolutely critical to make this obvious because any user of 'okfn' down in these hook chains have the be strictly audited for escapability. Specifically, escapability of references to objects outside of the packet processing path. And that's exactly what nf_queue() does via it's packet reinjection framework. In fact this points out a bug in Jiri's original attempt to push the socket pointer down through netfilter's okfn. It didn't grab and drop a reference to the socket in net/netfilter/nf_queue.c as needed. Furthermore, so many code paths are simplified, and should in fact be more efficient because we aren't passing in arguments that often are simply not used by the netfilter hook at all. Further simplifications are probably possible, but this series takes care of the main cases. Unfortunately I couldn't convert ebt_do_table() because ebtables is complete and utter crap and uses ebt_do_table() outside of the hook call chains. But that should not be news to anyone. Signed-off-by: David S. Miller <davem@davemloft.net> Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/core')
0 files changed, 0 insertions, 0 deletions