summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2018-01-091-3/+5
|\
| * netfilter: nf_tables: fix potential NULL-ptr deref in nf_tables_dump_obj_done()Hangbin Liu2017-12-261-2/+4
| * netfilter: nf_tables: fix chain filter in nf_tables_dump_rules()Pablo Neira Ayuso2017-12-211-1/+1
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2018-01-071-12/+2Star
|\ \ | |/ |/|
| * fix "netfilter: xt_bpf: Fix XT_BPF_MODE_FD_PINNED mode of 'xt_bpf_info_v1'"Al Viro2018-01-051-12/+2Star
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2017-12-1311-33/+161
|\ \
| * | netfilter: exthdr: add missign attributes to policyFlorian Westphal2017-12-111-0/+2
| * | netfilter: xt_osf: Add missing permission checksKevin Cernekee2017-12-061-0/+7
| * | netfilter: xt_bpf: add overflow checksJann Horn2017-12-041-0/+6
| * | netfilter: nfnetlink_cthelper: Add missing permission checksKevin Cernekee2017-12-041-0/+10
| * | netfilter: conntrack: clamp timeouts to INT_MAXJay Elliott2017-11-281-3/+9
| * | netfilter: conntrack: lower timeout to RETRANS seconds if window is 0Florian Westphal2017-11-201-0/+3
| * | netfilter: nf_ct_h323: Extend nf_h323_error_boundary to work on bits as wellEric Sesterhenn2017-11-201-30/+62
| * | netfilter: nf_ct_h323: Convert CHECK_BOUND macro to functionEric Sesterhenn2017-11-201-29/+65
| * | netfilter: exit_net cleanup check addedVasily Averin2017-11-204-0/+26
* | | net: remove duplicate includesPravin Shedge2017-12-131-1/+0Star
| |/ |/|
* | treewide: setup_timer() -> timer_setup()Kees Cook2017-11-224-16/+14Star
|/
* netfilter: add ifdef around ctnetlink_proto_sizeArnd Bergmann2017-11-161-0/+2
* Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2017-11-153-3/+3
|\
| * treewide: Fix function prototypes for module_param_call()Kees Cook2017-10-313-3/+3
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2017-11-1529-554/+673
|\ \
| * \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2017-11-0823-538/+647
| |\ \
| | * | netfilter: nf_tables: get set elements via netlinkPablo Neira Ayuso2017-11-074-55/+259
| | * | netfilter: nf_tables: performance set policy skips size description in selectionPablo Neira Ayuso2017-11-071-8/+3Star
| | * | netfilter: conntrack: use power efficient workqueueVincent Guittot2017-11-071-2/+2
| | * | netfilter: conntrack: move nf_ct_netns_{get,put}() to corePablo Neira Ayuso2017-11-062-38/+38
| | * | netfilter: conntrack: don't cache nlattr_tuple_size result in nla_sizeFlorian Westphal2017-11-064-9/+21
| | * | netfilter: nft_hash: fix nft_hash_deactivateFlorian Westphal2017-11-061-1/+1
| | * | netfilter: xt_connlimit: remove mask argumentFlorian Westphal2017-11-061-32/+20Star
| | * | netfilter: ipvs: Fix inappropriate output of procfsKUWAZAWA Takuya2017-11-061-0/+4
| | * | netfilter: ipvs: Use %pS printk format for direct addressesHelge Deller2017-11-062-3/+3
| | * | netfilter: nf_ct_h323: Out Of Bound Read in Netfilter ConntrackEric Sesterhenn2017-10-241-0/+1
| | * | netfilter: xt_connlimit: don't store address in the conn nodesFlorian Westphal2017-10-241-3/+0Star
| | * | netfilter: nf_conntrack_h323: Remove typedef structHarsha Sharma2017-10-241-40/+40
| | * | netfilter: x_tables: make xt_replace_table wait until old rules are not used ...Florian Westphal2017-10-241-3/+18
| | * | netfilter: conntrack: remove pf argument from l4 packet functionsFlorian Westphal2017-10-247-10/+3Star
| | * | netfilter: conntrack: add and use nf_ct_l4proto_log_invalidFlorian Westphal2017-10-243-28/+37
| | * | netfilter: conntrack: add and use nf_l4proto_log_invalidFlorian Westphal2017-10-245-37/+55
| | * | netfilter: nat: use test_and_clear_bit when deleting ct from bysource listFlorian Westphal2017-10-241-6/+3Star
| | * | netfilter: ipset: deduplicate prefixlen mapsAaron Conole2017-10-041-258/+137Star
| | * | netfilter: ipset: Fix sparse warningsJozsef Kadlecsik2017-10-041-1/+1
| | * | netfilter: ipset: Compress return logicsimran singhal2017-10-041-4/+1Star
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2017-11-049-1/+8
| |\ \ \
| * | | | bpf: Add file mode configuration into bpf mapsChenbo Feng2017-10-201-1/+1
| * | | | netfilter: ipset: Convert timers to use timer_setup()Kees Cook2017-10-186-15/+25
| | |_|/ | |/| |
* | | | Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2017-11-145-22/+23
|\ \ \ \
| * | | | netfilter: ipvs: Convert timers to use timer_setup()Kees Cook2017-11-095-22/+23
| | |_|/ | |/| |
* | | | Merge branch 'linus' into locking/core, to resolve conflictsIngo Molnar2017-11-079-1/+8
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2017-11-031-1/+0Star
| |\ \ \
| | * | | netfilter: nft_set_hash: disable fast_ops for 2-len keysAnatole Denis2017-10-251-1/+0Star
| | | |/ | | |/|