summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2016-05-153-0/+4
|\
| * nf_conntrack: avoid kernel pointer value leak in slab nameLinus Torvalds2016-05-141-1/+3
| * netfilter: nfnetlink_acct: validate NFACCT_QUOTA parameterPhil Turnbull2016-05-051-0/+2
| * netfilter: IDLETIMER: fix race condition when destroy the targetLiping Zhang2016-04-291-0/+1
| * netfilter: conntrack: init all_locks to avoid debug warningFlorian Westphal2016-04-291-1/+1
* | netfilter: conntrack: remove uninitialized shadow variableArnd Bergmann2016-05-101-1/+0
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2016-05-0917-310/+726
|\ \
| * | netfilter: conntrack: use single slab cacheFlorian Westphal2016-05-091-22/+14
| * | netfilter: conntrack: use a single nat bysource table for all namespacesFlorian Westphal2016-05-091-16/+17
| * | netfilter: conntrack: make netns address part of nat bysrc hashFlorian Westphal2016-05-091-3/+3
| * | Merge tag 'ipvs2-for-v4.7' of https://git.kernel.org/pub/scm/linux/kernel/git...Pablo Neira Ayuso2016-05-062-4/+26
| |\ \
| | * | ipvs: make drop_entry protection effective for SIP-peMarco Angaroni2016-05-062-4/+26
| * | | netfilter: conntrack: use a single expectation table for all namespacesFlorian Westphal2016-05-063-28/+22
| * | | netfilter: conntrack: make netns address part of expect hashFlorian Westphal2016-05-061-7/+10
| * | | netfilter: conntrack: check netns when walking expect hashFlorian Westphal2016-05-062-4/+27
| |/ /
| * | netfilter: nf_tables: allow set names up to 32 bytesPablo Neira Ayuso2016-05-051-3/+3
| * | netfilter: conntrack: introduce clash resolution on insertion racePablo Neira Ayuso2016-05-053-3/+54
| * | netfilter: conntrack: introduce nf_ct_acct_update()Pablo Neira Ayuso2016-05-051-23/+19
| * | netfilter: conntrack: __nf_ct_l4proto_find() always returns valid pointerPablo Neira Ayuso2016-05-051-1/+1
| * | netfilter: conntrack: consider ct netns in early_drop logicFlorian Westphal2016-05-051-18/+25
| * | netfilter: conntrack: use a single hashtable for all namespacesFlorian Westphal2016-05-056-59/+56
| * | netfilter: conntrack: make netns address part of hashFlorian Westphal2016-05-051-17/+18
| * | netfilter: conntrack: check netns when comparing conntrack objectsFlorian Westphal2016-05-052-10/+16
| * | netfilter: conntrack: use nf_ct_key_equal() in more placesFlorian Westphal2016-05-051-18/+11
| * | netfilter: conntrack: don't attempt to iterate over empty tableFlorian Westphal2016-05-051-0/+3
| * | netfilter: conntrack: fix lookup race during hash resizeFlorian Westphal2016-05-051-5/+19
| * | netfilter: conntrack: keep BH enabled during lookupFlorian Westphal2016-05-051-17/+8
| * | netfilter: nftables: add connlabel set supportFlorian Westphal2016-05-051-0/+30
| * | Merge tag 'ipvs-for-v4.7' of https://git.kernel.org/pub/scm/linux/kernel/git/...Pablo Neira Ayuso2016-04-255-5/+243
| |\ \
| | * | ipvs: don't alter conntrack in OPS modeMarco Angaroni2016-04-202-1/+6
| | * | ipvs: optimize release of connections in OPS modeMarco Angaroni2016-04-201-3/+23
| | * | ipvs: handle connections started by real-serversMarco Angaroni2016-04-203-1/+214
| * | | netfilter: nf_ct_helper: disable automatic helper assignmentPablo Neira Ayuso2016-04-251-2/+2
| * | | netfilter: nft_rbtree: allow adjacent intervals with dynamic updatesPablo Neira Ayuso2016-04-251-5/+35
| * | | netfilter: nft_rbtree: introduce nft_rbtree_interval_end() helperPablo Neira Ayuso2016-04-251-3/+6
| * | | netfilter: nf_tables: parse element flags from nft_del_setelem()Pablo Neira Ayuso2016-04-251-5/+33
| * | | netfilter: nf_tables: introduce nft_setelem_parse_flags() helperPablo Neira Ayuso2016-04-251-12/+22
| * | | netfilter: conntrack: use get_random_once for conntrack hash seedFlorian Westphal2016-04-251-23/+3
| * | | netfilter: conntrack: use get_random_once for nat and expectationsFlorian Westphal2016-04-252-6/+7
| * | | netfilter: conntrack: move generation seqcnt out of netns_ctFlorian Westphal2016-04-251-9/+11
* | | | netfilter/ipvs: use nla_put_u64_64bit()Nicolas Dichtel2016-04-251-12/+24
|/ / /
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2016-04-247-117/+323
|\ \ \
| * | | netfilter: conntrack: don't acquire lock during seq_printfFlorian Westphal2016-04-192-14/+2
| |/ /
| * | netfilter: ctnetlink: restore inlining for netlink message size calculationPablo Neira Ayuso2016-04-181-5/+5
| * | netfilter: connlabels: change nf_connlabels_get bit arg to 'highest used'Florian Westphal2016-04-183-5/+8
| * | netfilter: labels: don't emit ct event if labels were not changedFlorian Westphal2016-04-181-6/+10
| * | netfilter: connlabels: move helpers to xt_connlabelFlorian Westphal2016-04-182-19/+12
| * | netfilter: ctnetlink: remove unnecessary inliningPablo Neira Ayuso2016-04-141-69/+48
| * | netfilter: x_tables: introduce and use xt_copy_counters_from_userFlorian Westphal2016-04-141-0/+74
| * | netfilter: x_tables: do compat validation via translate_tableFlorian Westphal2016-04-141-0/+8