summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2017-05-2114-72/+227
|\
| * netfilter: xtables: fix build failure from COMPAT_XT_ALIGN outside CONFIG_COMPATWillem de Bruijn2017-05-181-8/+13
| * netfilter: nf_tables: revisit chain/object refcounting from elementsPablo Neira Ayuso2017-05-155-17/+80
| * netfilter: nf_tables: missing sanitization in data from userspacePablo Neira Ayuso2017-05-152-7/+24
| * netfilter: nf_tables: can't assume lock is acquired when dumping set elemsLiping Zhang2017-05-152-23/+57
| * netfilter: synproxy: fix conntrackd interactionEric Leblond2017-05-151-0/+4
| * netfilter: xtables: zero padding in data_to_userWillem de Bruijn2017-05-151-3/+6
| * Merge tag 'ipvs-fixes-for-v4.12' of http://git.kernel.org/pub/scm/linux/kerne...Pablo Neira Ayuso2017-05-151-5/+14
| |\
| | * ipvs: SNAT packet replies only for NATed connectionsJulian Anastasov2017-05-081-5/+14
| * | netfilter: nfnl_cthelper: reject del request if helper obj is in useLiping Zhang2017-05-152-6/+17
| * | netfilter: introduce nf_conntrack_helper_put helper functionLiping Zhang2017-05-153-5/+11
| * | netfilter: don't setup nat info for confirmed ctLiping Zhang2017-05-151-0/+4
| * | netfilter: ctnetlink: Make some parameters integer to avoid enum mismatchMatthias Kaehlcke2017-05-151-4/+3
* | | Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2017-05-101-4/+4
|\ \ \ | |/ / |/| |
| * | Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/pau...Ingo Molnar2017-04-231-4/+4
| |\ \
| | * | mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCUPaul E. McKenney2017-04-181-4/+4
* | | | mm, vmalloc: use __GFP_HIGHMEM implicitlyMichal Hocko2017-05-081-2/+1
* | | | treewide: use kv[mz]alloc* rather than opencoded variantsMichal Hocko2017-05-082-21/+5
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2017-05-0410-58/+113
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2017-05-039-57/+112
| |\ \ \
| | * | | netfilter: nf_tables: check if same extensions are set when adding elementsPablo Neira Ayuso2017-05-031-0/+5
| | * | | Merge tag 'ipvs-fixes-for-v4.11' of http://git.kernel.org/pub/scm/linux/kerne...Pablo Neira Ayuso2017-04-281-5/+17
| | |\ \ \
| | | * | | ipvs: explicitly forbid ipv6 service/dest creation if ipv6 mod is disabledPaolo Abeni2017-04-281-5/+17
| | * | | | netfilter: x_tables: unlock on error in xt_find_table_lock()Dan Carpenter2017-04-281-1/+3
| | |/ / /
| | * | | netfilter: nft_dynset: continue to next expr if _OP_ADD succeededLiping Zhang2017-04-251-3/+2
| | * | | netfilter: xt_socket: Fix broken IPv6 handlingPeter Tirsek2017-04-241-1/+1
| | * | | netfilter: ctnetlink: acquire ct->lock before operating nf_ct_seqadjLiping Zhang2017-04-241-6/+15
| | * | | netfilter: ctnetlink: make it safer when updating ct->statusLiping Zhang2017-04-241-9/+24
| | * | | netfilter: ctnetlink: fix deadlock due to acquire _expect_lock twiceLiping Zhang2017-04-241-12/+12
| | * | | netfilter: ctnetlink: drop the incorrect cthelper module requestLiping Zhang2017-04-241-16/+1
| | * | | netfilter: nft_set_bitmap: free dummy elements when destroy the setLiping Zhang2017-04-241-0/+5
| | * | | netfilter: nf_ct_helper: permit cthelpers with different names via nfnetlinkLiping Zhang2017-04-241-5/+21
| | * | | netfilter: xt_CT: fix refcnt leak on error pathGao Feng2017-04-241-2/+9
| | |/ /
| * | | netfilter: conntrack: Force inlining of build check to prevent build failureGeert Uytterhoeven2017-05-031-1/+1
* | | | Merge branch 'stable-4.12' of git://git.infradead.org/users/pcmoore/auditLinus Torvalds2017-05-031-98/+28
|\ \ \ \ | |/ / / |/| | |
| * | | audit: normalize NETFILTER_PKTRichard Guy Briggs2017-05-021-97/+27
| * | | netfilter: use consistent ipv4 network offset in xt_AUDITRichard Guy Briggs2017-05-021-1/+1
| |/ /
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2017-05-0170-506/+533
|\ \ \
| * | | netfilter: nf_ct_ext: invoke destroy even when ext is not attachedLiping Zhang2017-05-011-6/+2
| * | | Merge tag 'ipvs3-for-v4.12' of http://git.kernel.org/pub/scm/linux/kernel/git...Pablo Neira Ayuso2017-05-012-23/+1
| |\ \ \
| | * | | ipvs: change comparison on sync_refresh_periodAaron Conole2017-04-281-1/+1
| | * | | ipvs: remove unused function ip_vs_set_state_timeoutAaron Conole2017-04-281-22/+0
| * | | | netfilter: nf_queue: only call synchronize_net twice if nf_queue is activeFlorian Westphal2017-05-014-22/+26
| * | | | netfilter: nf_log: don't call synchronize_rcu in nf_log_unsetFlorian Westphal2017-05-012-2/+1
| * | | | netfilter: batch synchronize_net calls during hook unregisterFlorian Westphal2017-05-011-6/+40
| |/ / /
| * | | netfilter: don't attach a nat extension by defaultFlorian Westphal2017-04-261-6/+0
| * | | netfilter: pptp: attach nat extension when neededFlorian Westphal2017-04-261-2/+10
| * | | netfilter: conntrack: handle initial extension alloc via kreallocFlorian Westphal2017-04-261-36/+15
| * | | netfilter: conntrack: mark extension structs as constFlorian Westphal2017-04-268-9/+9
| * | | netfilter: conntrack: remove prealloc supportFlorian Westphal2017-04-262-46/+4
OpenPOWER on IntegriCloud