iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/net/netfilter
History
David S. Miller 6934e79ed1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next 
Pablo Neira Ayuso says:

====================
Netfilter/nf_tables fixes for net-next

This patchset contains fixes for recent updates available in your
net-next, they are:

1) Fix double memory allocation for accounting objects that results
   in a leak, this slipped through with the new quota extension,
   patch from Mathieu Poirier.

2) Fix broken ordering when adding set element transactions.

3) Make sure that objects are released in reverse order in the abort
   path, to avoid possible use-after-free when accessing dependencies.

4) Allow to delete several objects (as long as dependencies are
   fulfilled) by using one batch. This includes changes in the use
   counter semantics of the nf_tables objects.

5) Fix illegal sleeping allocation from rcu callback.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-06-05 15:35:04 -07:00
..
ipset
net: use the new API kvfree()
2014-06-05 00:49:51 -07:00
ipvs
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-06-03 23:32:12 -07:00
core.c
netfilter: pass hook ops to hookfn
2013-10-14 11:29:31 +02:00
Kconfig
netfilter: nf_tables: add reject module for NFPROTO_INET
2014-02-06 09:44:18 +01:00
Makefile
netfilter: nf_tables: add reject module for NFPROTO_INET
2014-02-06 09:44:18 +01:00
nf_conntrack_acct.c
netfilter: introduce nf_conn_acct structure
2013-11-03 21:48:49 +01:00
nf_conntrack_amanda.c
netfilter: add my copyright statements
2013-04-18 20:27:55 +02:00
nf_conntrack_broadcast.c
netfilter: nf_conntrack: nf_conntrack snmp helper
2011-01-18 18:12:24 +01:00
nf_conntrack_core.c
netfilter: nf_conntrack: initialize net.ct.generation
2014-04-14 10:35:28 +02:00
nf_conntrack_ecache.c
netfilter: add my copyright statements
2013-04-18 20:27:55 +02:00
nf_conntrack_expect.c
netfilter: conntrack: seperate expect locking from nf_conntrack_lock
2014-03-07 11:41:01 +01:00
nf_conntrack_extend.c
netfilter: nf_ct_ext: support variable length extensions
2012-06-16 15:08:49 +02:00
nf_conntrack_ftp.c
netfilter: Implement RFC 1123 for FTP conntrack
2013-05-27 13:32:43 +02:00
nf_conntrack_h323_asn1.c
netfilter: h323: bug in parsing of ASN1 SEQOF field
2011-04-04 15:21:02 +02:00
nf_conntrack_h323_main.c
netfilter: conntrack: seperate expect locking from nf_conntrack_lock
2014-03-07 11:41:01 +01:00
nf_conntrack_h323_types.c
…
nf_conntrack_helper.c
netfilter: conntrack: remove central spinlock nf_conntrack_lock
2014-03-07 11:41:13 +01:00
nf_conntrack_irc.c
netfilter: add my copyright statements
2013-04-18 20:27:55 +02:00
nf_conntrack_l3proto_generic.c
…
nf_conntrack_labels.c
netfilter: connlabels: remove unneeded includes
2013-07-31 16:39:18 +02:00
nf_conntrack_netbios_ns.c
netfilter: nf_conntrack: nf_conntrack snmp helper
2011-01-18 18:12:24 +01:00
nf_conntrack_netlink.c
netfilter: ctnetlink: don't add null bindings if no nat requested
2014-04-29 20:49:08 +02:00
nf_conntrack_pptp.c
netfilter: nf_conntrack: flush net_gre->keymap_list only from gre helper
2014-04-08 10:56:12 +02:00
nf_conntrack_proto_dccp.c
netfilter: nf_conntrack_dccp: fix skb_header_pointer API usages
2014-01-06 17:40:02 +01:00
nf_conntrack_proto_generic.c
netfilter: nf_conntrack: generalize nf_ct_l4proto_net
2012-07-04 19:37:22 +02:00
nf_conntrack_proto_gre.c
netfilter: nf_conntrack: flush net_gre->keymap_list only from gre helper
2014-04-08 10:56:12 +02:00
nf_conntrack_proto_sctp.c
netfilter: add my copyright statements
2013-04-18 20:27:55 +02:00
nf_conntrack_proto_tcp.c
netfilter: add SYNPROXY core/target
2013-08-28 00:27:54 +02:00
nf_conntrack_proto_udp.c
netfilter: add my copyright statements
2013-04-18 20:27:55 +02:00
nf_conntrack_proto_udplite.c
netfilter: nf_log: prepare net namespace support for loggers
2013-04-05 20:12:54 +02:00
nf_conntrack_proto.c
netfilter: nf_conntrack: remove dead code
2014-01-03 23:41:37 +01:00
nf_conntrack_sane.c
netfilter: nf_ct_helper: better logging for dropped packets
2013-02-19 02:48:05 +01:00
nf_conntrack_seqadj.c
netfilter: only warn once on wrong seqadj usage
2014-01-06 14:23:17 +01:00
nf_conntrack_sip.c
netfilter: conntrack: seperate expect locking from nf_conntrack_lock
2014-03-07 11:41:01 +01:00
nf_conntrack_snmp.c
netfilter: nf_ct_snmp: add include file
2013-01-18 00:28:18 +01:00
nf_conntrack_standalone.c
net: Convert uses of typedef ctl_table to struct ctl_table
2013-06-13 02:36:09 -07:00
nf_conntrack_tftp.c
netfilter: add my copyright statements
2013-04-18 20:27:55 +02:00
nf_conntrack_timeout.c
netfilter: nf_ct_timeout: move initialization out of pernet_operations
2013-01-23 12:56:02 +01:00
nf_conntrack_timestamp.c
netfilter: nf_ct_timestamp: Fix BUG_ON after netns deletion
2013-12-20 14:58:29 +01:00
nf_internals.h
net: misc: Remove extern from function prototypes
2013-10-19 19:12:11 -04:00
nf_log.c
net: Convert uses of typedef ctl_table to struct ctl_table
2013-06-13 02:36:09 -07:00
nf_nat_amanda.c
netfilter: add my copyright statements
2013-04-18 20:27:55 +02:00
nf_nat_core.c
netfilter: add helper for adding nat extension
2014-04-29 20:56:22 +02:00
nf_nat_ftp.c
netfilter: nf_ct_helper: better logging for dropped packets
2013-02-19 02:48:05 +01:00
nf_nat_helper.c
netfilter: nf_conntrack: make sequence number adjustments usuable without NAT
2013-08-28 00:26:48 +02:00
nf_nat_irc.c
netfilter: nf_nat: fix access to uninitialized buffer in IRC NAT helper
2014-01-06 14:17:17 +01:00
nf_nat_proto_common.c
netfilter: nf_nat: add full port randomization support
2014-01-03 23:41:26 +01:00
nf_nat_proto_dccp.c
netfilter: add protocol independent NAT core
2012-08-30 03:00:14 +02:00
nf_nat_proto_sctp.c
net/sctp: Refactor SCTP skb checksum computation
2013-07-27 20:07:15 -07:00
nf_nat_proto_tcp.c
netfilter: add protocol independent NAT core
2012-08-30 03:00:14 +02:00
nf_nat_proto_udp.c
netfilter: add protocol independent NAT core
2012-08-30 03:00:14 +02:00
nf_nat_proto_udplite.c
netfilter: add protocol independent NAT core
2012-08-30 03:00:14 +02:00
nf_nat_proto_unknown.c
netfilter: add protocol independent NAT core
2012-08-30 03:00:14 +02:00
nf_nat_sip.c
netfilter: nf_ct_sip: consolidate NAT hook functions
2013-10-01 12:47:09 +02:00
nf_nat_tftp.c
netfilter: nf_ct_helper: better logging for dropped packets
2013-02-19 02:48:05 +01:00
nf_queue.c
netfilter: move skb_gso_segment into nfnetlink_queue module
2013-04-29 20:09:05 +02:00
nf_sockopt.c
…
nf_synproxy_core.c
netfilter: nf_conntrack: don't release a conntrack with non-zero refcnt
2014-02-05 17:46:06 +01:00
nf_tables_api.c
netfilter: nf_tables: atomic allocation in set notifications from rcu callback
2014-06-02 10:54:38 +02:00
nf_tables_core.c
netfilter: nf_tables: fix trace of matching non-terminal rule
2014-05-15 19:44:20 +02:00
nf_tables_inet.c
netfilter: nf_tables: fix error path in the init functions
2014-01-09 23:25:48 +01:00
nfnetlink_acct.c
netfilter: nfnetlink_acct: Fix memory leak
2014-06-02 10:46:52 +02:00
nfnetlink_cthelper.c
netfilter: check return code from nla_parse_tested
2013-06-20 11:20:13 +02:00
nfnetlink_cttimeout.c
netfilter: cttimeout: allow to set/get default protocol timeouts
2013-10-01 13:17:39 +02:00
nfnetlink_log.c
netfilter: nfnetlink_log: remove unused code
2014-02-25 11:30:01 +01:00
nfnetlink_queue_core.c
core, nfqueue, openvswitch: Orphan frags in skb_zerocopy and handle errors
2014-03-27 15:29:38 -04:00
nfnetlink_queue_ct.c
netfilter: nf_conntrack: make sequence number adjustments usuable without NAT
2013-08-28 00:26:48 +02:00
nfnetlink.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-05-12 13:19:14 -04:00
nft_bitwise.c
netfilter: nf_tables: expression ops overloading
2013-10-14 17:16:08 +02:00
nft_byteorder.c
netfilter: nf_tables: expression ops overloading
2013-10-14 17:16:08 +02:00
nft_cmp.c
netfilter: nf_tables: fix nft_cmp_fast failure on big endian for size < 4
2014-04-14 10:38:02 +02:00
nft_compat.c
netfilter: nf_tables: restore context for expression destructors
2014-03-08 12:35:17 +01:00
nft_counter.c
netfilter: nf_tables: expression ops overloading
2013-10-14 17:16:08 +02:00
nft_ct.c
netfilter: nft_ct: split nft_ct_init() into two functions for get/set
2014-04-02 21:29:45 +02:00
nft_expr_template.c
netfilter: nf_tables: expression ops overloading
2013-10-14 17:16:08 +02:00
nft_exthdr.c
netfilter: nft_exthdr: call ipv6_find_hdr() with explicitly initialized offset
2013-12-20 11:25:10 +01:00
nft_hash.c
net: use the new API kvfree()
2014-06-05 00:49:51 -07:00
nft_immediate.c
netfilter: nf_tables: restore context for expression destructors
2014-03-08 12:35:17 +01:00
nft_limit.c
netfilter: nf_tables: expression ops overloading
2013-10-14 17:16:08 +02:00
nft_log.c
netfilter: nf_tables: restore context for expression destructors
2014-03-08 12:35:17 +01:00
nft_lookup.c
netfilter: nf_tables: use new transaction infrastructure to handle sets
2014-05-19 12:06:10 +02:00
nft_meta.c
netfilter: nf_tables: Make meta expression core functions public
2014-04-23 13:55:30 +02:00
nft_nat.c
netfilter: nft_nat: fix family validation
2014-03-08 12:35:19 +01:00
nft_payload.c
netfilter: nf_tables: check if payload length is a power of 2
2014-02-17 11:21:17 +01:00
nft_queue.c
netfilter: nf_tables: fix log/queue expressions for NFPROTO_INET
2014-02-06 11:41:38 +01:00
nft_rbtree.c
netfilter: nft_rbtree: introduce locking
2014-06-02 10:54:31 +02:00
nft_reject_inet.c
netfilter: nft_reject_inet: fix unintended fall-through in switch-statatement
2014-02-14 11:37:33 +01:00
nft_reject.c
netfilter: nft_reject: split up reject module into IPv4 and IPv6 specifc parts
2014-02-06 09:44:10 +01:00
x_tables.c
netfilter: x_tables: fix ordering of jumpstack allocation and table update
2013-10-22 10:11:29 +02:00
xt_addrtype.c
netfilter: xt_addrtype: fix trivial typo
2013-07-31 16:36:25 +02:00
xt_AUDIT.c
netfilter: Convert uses of __constant_<foo> to <foo>
2014-03-13 14:13:19 +01:00
xt_bpf.c
net: filter: let unattached filters use sock_fprog_kern
2014-05-23 16:48:05 -04:00
xt_cgroup.c
netfilter: x_tables: allow to use cgroup match for LOCAL_IN nf hooks
2014-04-03 23:52:17 +02:00
xt_CHECKSUM.c
…
xt_CLASSIFY.c
…
xt_cluster.c
…
xt_comment.c
…
xt_connbytes.c
netfilter: introduce nf_conn_acct structure
2013-11-03 21:48:49 +01:00
xt_connlabel.c
netfilter: add connlabel conntrack extension
2013-01-18 00:28:15 +01:00
xt_connlimit.c
netfilter: connlimit: move lock array out of struct connlimit_data
2014-04-03 23:52:13 +02:00
xt_connmark.c
netfilter: Fix FSF address in file headers
2013-12-06 12:37:57 -05:00
xt_CONNSECMARK.c
…
xt_conntrack.c
netfilter: add my copyright statements
2013-04-18 20:27:55 +02:00
xt_cpu.c
netfilter: xtables: add missing aliases for autoloading via iptables
2011-01-18 06:33:54 +01:00
xt_CT.c
netfilter: nf_conntrack: don't release a conntrack with non-zero refcnt
2014-02-05 17:46:06 +01:00
xt_dccp.c
…
xt_devgroup.c
netfilter: xtables: add device group match
2011-02-03 00:05:43 +01:00
xt_dscp.c
…
xt_DSCP.c
netfilter: IPv6: fix DSCP mangle code
2011-05-10 10:00:21 +02:00
xt_ecn.c
netfilter: xtables: collapse conditions in xt_ecn
2011-12-27 20:45:25 +01:00
xt_esp.c
…
xt_hashlimit.c
Revert "netfilter: avoid get_random_bytes calls"
2014-01-06 14:00:55 +01:00
xt_helper.c
…
xt_hl.c
netfilter: Reduce switch/case indent
2011-07-01 16:11:15 -07:00
xt_HL.c
netfilter: Reduce switch/case indent
2011-07-01 16:11:15 -07:00
xt_HMARK.c
ipv6: Move ipv6_find_hdr() out of Netfilter code.
2012-11-09 17:05:07 -08:00
xt_IDLETIMER.c
netfilter: Remove unnecessary OOM logging messages
2011-11-01 09:19:49 +01:00
xt_ipcomp.c
netfilter: xt_ipcomp: Use ntohs to ease sparse warning
2014-02-19 11:41:25 +01:00
xt_iprange.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2011-02-04 14:28:58 -08:00
xt_ipvs.c
ipvs: API change to avoid rescan of IPv6 exthdr
2012-09-28 11:34:33 +09:00
xt_l2tp.c
netfilter: introduce l2tp match extension
2014-01-09 21:36:39 +01:00
xt_LED.c
netfilter: xtables: add missing aliases for autoloading via iptables
2011-01-18 06:33:54 +01:00
xt_length.c
…
xt_limit.c
netfilter: add my copyright statements
2013-04-18 20:27:55 +02:00
xt_LOG.c
netfilter: xt_LOG: fix mark logging for IPv6 packets
2013-05-29 12:29:18 +02:00
xt_mac.c
netfilter: Convert compare_ether_addr to ether_addr_equal
2012-05-09 20:49:18 -04:00
xt_mark.c
…
xt_multiport.c
…
xt_nat.c
netfilter: xt_nat: fix incorrect hooks for SNAT and DNAT targets
2012-10-15 13:39:12 +02:00
xt_NETMAP.c
netfilter: combine ipt_NETMAP and ip6t_NETMAP
2012-09-21 12:11:08 +02:00
xt_nfacct.c
netfilter: nfnetlink_acct: Adding quota support to accounting framework
2014-04-29 18:25:14 +02:00
xt_NFLOG.c
netfilter: log: netns NULL ptr bug when calling from conntrack
2013-05-15 14:11:07 +02:00
xt_NFQUEUE.c
netfilter: xt_NFQUEUE: separate reusable code
2013-12-07 23:20:45 +01:00
xt_osf.c
netfilter: Add {ipt,ip6t}_osf aliases for xt_osf
2014-04-03 23:52:22 +02:00
xt_owner.c
userns: xt_owner: Add basic user namespace support.
2012-08-14 21:55:30 -07:00
xt_physdev.c
…
xt_pkttype.c
…
xt_policy.c
…
xt_quota.c
net: Fix files explicitly needing to include module.h
2011-10-31 19:30:28 -04:00
xt_rateest.c
net_sched: add 64bit rate estimators
2013-06-11 02:51:03 -07:00
xt_RATEEST.c
Revert "netfilter: avoid get_random_bytes calls"
2014-01-06 14:00:55 +01:00
xt_realm.c
…
xt_recent.c
net: use the new API kvfree()
2014-06-05 00:49:51 -07:00
xt_REDIRECT.c
netfilter: combine ipt_REDIRECT and ip6t_REDIRECT
2012-09-21 12:12:05 +02:00
xt_repldata.h
…
xt_sctp.c
…
xt_SECMARK.c
…
xt_set.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-11-15 16:47:22 -08:00
xt_socket.c
netfilter: xt_socket: use sock_gen_put()
2013-10-17 10:27:25 +02:00
xt_state.c
…
xt_statistic.c
net: replace macros net_random and net_srandom with direct calls to prandom
2014-01-14 15:15:25 -08:00
xt_string.c
…
xt_tcpmss.c
…
xt_TCPMSS.c
netfilter: xt_TCPMSS: lookup route from proper net namespace
2013-09-27 16:18:23 +02:00
xt_TCPOPTSTRIP.c
netfilter: xt_TCPOPTSTRIP: fix possible off by one access
2013-08-01 11:45:15 +02:00
xt_tcpudp.c
…
xt_TEE.c
net: pass info struct via netdevice notifier
2013-05-28 13:11:01 -07:00
xt_time.c
netfilter: xt_time: add support to ignore day transition
2012-09-24 14:29:01 +02:00
xt_TPROXY.c
ipv6: make lookups simpler and faster
2013-10-09 00:01:25 -04:00
xt_TRACE.c
…
xt_u32.c
…