David S. Miller
4ecdf77091
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
...
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for you net tree:
1) Remove duplicated include at the end of UDP conntrack, from Yue Haibing.
2) Restore conntrack dependency on xt_cluster, from Martin Willi.
3) Fix splat with GSO skbs from the checksum target, from Florian Westphal.
4) Rework ct timeout support, the template strategy to attach custom timeouts
is not correct since it will not work in conjunction with conntrack zones
and we have a possible free after use when removing the rule due to missing
refcounting. To fix these problems, do not use conntrack template at all
and set custom timeout on the already valid conntrack object. This
fix comes with a preparation patch to simplify timeout adjustment by
initializating the first position of the timeout array for all of the
existing trackers. Patchset from Florian Westphal.
5) Fix missing dependency on from IPv4 chain NAT type, from Florian.
6) Release chain reference counter from the flush path, from Taehee Yoo.
7) After flushing an iptables ruleset, conntrack hooks are unregistered
and entries are left stale to be cleaned up by the timeout garbage
collector. No TCP tracking is done on established flows by this time.
If ruleset is reloaded, then hooks are registered again and TCP
tracking is restored, which considers packets to be invalid. Clear
window tracking to exercise TCP flow pickup from the middle given that
history is lost for us. Again from Florian.
8) Fix crash from netlink interface with CONFIG_NF_CONNTRACK_TIMEOUT=y
and CONFIG_NF_CT_NETLINK_TIMEOUT=n.
9) Broken CT target due to returning incorrect type from
ctnl_timeout_find_get().
10) Solve conntrack clash on NF_REPEAT verdicts too, from Michal Vaner.
11) Missing conversion of hashlimit sysctl interface to new API, from
Cong Wang.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-09-11 21:17:30 -07:00
..
9p
9p: Embed wait_queue_head into p9_req_t
2018-08-13 09:21:44 +09:00
bluetooth
Bluetooth: Add definitions for LE set address resolution
2018-08-10 16:57:57 +02:00
caif
caif: reduce stack size with KASAN
2018-01-19 14:02:12 -05:00
iucv
Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL
2018-06-28 10:40:47 -07:00
netfilter
netfilter: nf_tables: rework ct timeout set support
2018-08-29 13:04:38 +02:00
netns
ipv6: Add icmp_echo_ignore_all support for ICMPv6
2018-08-13 08:42:25 -07:00
nfc
phonet
proc: introduce proc_create_net{,_data}
2018-05-16 07:24:30 +02:00
sctp
net/sctp: Replace in/out stream arrays with flex_array
2018-08-11 12:25:15 -07:00
tc_act
Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux
2018-07-20 21:17:12 -07:00
6lowpan.h
act_api.h
net_sched: remove unused tcfa_capab
2018-08-21 12:45:45 -07:00
addrconf.h
bpf: Introduce BPF_PROG_TYPE_SK_REUSEPORT
2018-08-11 01:58:46 +02:00
af_ieee802154.h
ieee802154: add rx LQI from userspace
2018-07-13 12:18:18 -04:00
af_rxrpc.h
rxrpc: Push iov_iter up from rxrpc_kernel_recv_data() to caller
2018-08-03 12:46:20 -07:00
af_unix.h
af_vsock.h
vsock: split dwork to avoid reinitializations
2018-08-07 12:39:13 -07:00
ah.h
arp.h
ipv4: Make neigh lookup keys for loopback/point-to-point devices be INADDR_ANY
2018-01-15 14:53:43 -05:00
atmclip.h
ax25.h
proc: introduce proc_create_seq{,_data}
2018-05-16 07:23:35 +02:00
ax88796.h
net-next: ax88796: add interrupt status callback to platform data
2018-04-19 16:11:11 -04:00
bond_3ad.h
include/net/bond_3ad: Simplify the code by using the ARRAY_SIZE
2018-08-04 13:23:15 -07:00
bond_alb.h
bond_options.h
bonding.h
net: Add lag.h, net_lag_port_dev_txable()
2018-07-11 23:10:19 -07:00
busy_poll.h
net: remove sock_poll_busy_flag
2018-07-30 09:10:25 -07:00
calipso.h
cfg80211-wext.h
cfg80211.h
Here are quite a large number of fixes, notably:
2018-09-03 22:12:02 -07:00
cfg802154.h
checksum.h
cipso_ipv4.h
cls_cgroup.h
codel.h
codel_impl.h
codel_qdisc.h
compat.h
net: remove compat_sys_*() prototypes from net/compat.h
2018-04-02 20:16:17 +02:00
datalink.h
dcbevent.h
dcbnl.h
net: dcb: Add priority-to-DSCP map getters
2018-07-27 13:17:50 -07:00
devlink.h
devlink: Add generic parameters region_snapshot
2018-07-12 17:37:13 -07:00
dn.h
dn_dev.h
dn_fib.h
dn_neigh.h
dn_nsp.h
dn_route.h
decnet: Move dn_next into decnet route structure.
2017-11-30 09:54:25 -05:00
dsa.h
net: dsa: Remove VLA usage
2018-07-18 15:08:31 -07:00
dsfield.h
dst.h
xfrm: Remove xfrmi interface ID from flowi
2018-07-20 10:14:41 +02:00
dst_cache.h
net: core: dst_cache_set_ip6: Rename 'addr' parameter to 'saddr' for consistency
2018-03-05 12:52:45 -05:00
dst_metadata.h
dst_ops.h
erspan.h
erspan: set bso bit based on mirrored packet's len
2018-05-20 18:31:42 -04:00
esp.h
ethoc.h
inet: whitespace cleanup
2018-02-28 11:43:28 -05:00
failover.h
net: Introduce generic failover module
2018-05-28 22:59:54 -04:00
fib_notifier.h
fib_rules.h
net: fib_rules: add extack support
2018-04-23 10:21:24 -04:00
firewire.h
flow.h
xfrm: Remove xfrmi interface ID from flowi
2018-07-20 10:14:41 +02:00
flow_dissector.h
flow_dissector: allow dissection of tunnel options from metadata
2018-08-07 12:22:14 -07:00
fou.h
fq.h
fq_impl.h
garp.h
gen_stats.h
net: core: protect rate estimator statistics pointer with lock
2018-08-11 12:37:10 -07:00
genetlink.h
genetlink: fix genlmsg_nlhdr()
2017-11-16 10:49:00 +09:00
geneve.h
gre.h
net: GRE: Add is_gretap_dev, is_ip6gretap_dev
2018-02-27 14:46:26 -05:00
gro_cells.h
gtp.h
gue.h
fou: fix some member types in guehdr
2017-12-11 14:10:06 -05:00
hwbm.h
icmp.h
ieee80211_radiotap.h
radiotap: add structs for HE
2018-06-15 14:04:00 +02:00
ieee802154_netdev.h
if_inet6.h
net/ipv6: Add support for specifying metric of connected routes
2018-05-29 10:12:45 -04:00
ife.h
net: sched: ife: handle malformed tlv length
2018-04-22 21:12:00 -04:00
ila.h
inet6_connection_sock.h
inet6_hashtables.h
inet_common.h
net: Convert GRO SKB handling to list_head.
2018-06-26 11:33:04 +09:00
inet_connection_sock.h
inet/connection_sock: prefer _THIS_IP_ to current_text_addr
2018-08-14 10:04:36 -07:00
inet_ecn.h
inet_frag.h
ip: add helpers to process in-order fragments faster.
2018-08-11 17:54:18 -07:00
inet_hashtables.h
inet: Add a 2nd listener hashtable (port+addr)
2017-12-03 10:18:28 -05:00
inet_sock.h
net: add helpers checking if socket can be bound to nonlocal address
2018-08-01 09:50:04 -07:00
inet_timewait_sock.h
net-tcp: remove useless tw_timeout field
2018-06-05 10:45:24 -04:00
inetpeer.h
ip.h
ip: remove tx_flags from ipcm_cookie and use same logic for v4 and v6
2018-07-07 10:58:49 +09:00
ip6_checksum.h
ip6_fib.h
ipv6: use fib6_info_hold_safe() when necessary
2018-07-23 11:19:02 -07:00
ip6_route.h
net/ipv6: Revert attempt to simplify route replace and append
2018-07-04 15:22:13 +09:00
ip6_tunnel.h
ip6_gre: add erspan v2 support
2017-12-15 12:34:00 -05:00
ip_fib.h
net/ipv4: Add helper to return path MTU based on fib result
2018-05-22 10:51:09 +02:00
ip_tunnels.h
net: check tunnel option type in tunnel flags
2018-06-29 23:50:26 +09:00
ip_vs.h
ipvs: add assured state for conn templates
2018-07-18 11:26:40 +02:00
ipcomp.h
ipconfig.h
ipv6.h
net: don't declare IPv6 non-local bind helper if CONFIG_IPV6 undefined
2018-08-01 13:45:31 -07:00
ipv6_frag.h
ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module
2018-07-18 11:26:53 +02:00
ipx.h
iw_handler.h
net: Spelling s/stucture/structure/
2018-03-27 09:51:23 +02:00
kcm.h
l3mdev.h
lag.h
net: Add lag.h, net_lag_port_dev_txable()
2018-07-11 23:10:19 -07:00
lapb.h
lib80211.h
llc.h
llc: use refcount_inc_not_zero() for llc_sap_find()
2018-08-07 15:54:00 -07:00
llc_c_ac.h
llc_c_ev.h
llc_c_st.h
llc_conn.h
llc: delete timers synchronously in llc_sk_free()
2018-04-22 14:55:03 -04:00
llc_if.h
llc_pdu.h
llc_s_ac.h
llc_s_ev.h
llc_s_st.h
llc_sap.h
lwtunnel.h
net: Move ipv4 set_lwt_redirect helper to lwtunnel
2018-02-14 14:43:32 -05:00
mac80211.h
mac80211: add support for HE
2018-06-18 22:40:32 +02:00
mac802154.h
mip6.h
mld.h
mpls.h
mpls_iptunnel.h
mrp.h
ncsi.h
ndisc.h
neighbour.h
neighbour: support for NTF_EXT_LEARNED flag
2018-04-25 13:19:59 -04:00
net_failover.h
net: Introduce net_failover driver
2018-05-28 22:59:54 -04:00
net_namespace.h
net: create reusable function for getting ownership info of sysfs inodes
2018-07-20 23:44:36 -07:00
net_ratelimit.h
netevent.h
net: ipv4: Notify about changes to ip_forward_update_priority
2018-08-01 09:52:30 -07:00
netlabel.h
netlink.h
netprio_cgroup.h
netrom.h
proc: introduce proc_create_seq{,_data}
2018-05-16 07:23:35 +02:00
nexthop.h
net: fix rtnh_ok()
2018-04-07 22:32:31 -04:00
nl802154.h
nsh.h
p8022.h
page_pool.h
xdp: introduce xdp_return_frame_rx_napi
2018-05-24 18:36:15 -07:00
ping.h
ipv{4,6}/ping: simplify proc file creation
2018-05-16 07:23:35 +02:00
pkt_cls.h
net_sched: fix unused variable warning in stmmac
2018-08-22 21:40:21 -07:00
pkt_sched.h
net/sched: Add HW offloading capability to ETF
2018-07-04 22:30:27 +09:00
pptp.h
protocol.h
psample.h
psnap.h
raw.h
ipv{4,6}/raw: simplify ѕeq_file code
2018-05-16 07:23:35 +02:00
rawv6.h
red.h
net_sched: red: Avoid illegal values
2017-12-05 14:37:13 -05:00
regulatory.h
cfg80211: make wmm_rule part of the reg_rule structure
2018-08-28 11:11:47 +02:00
request_sock.h
rose.h
proc: introduce proc_create_seq{,_data}
2018-05-16 07:23:35 +02:00
route.h
net/ipv4: Add support for specifying metric of connected routes
2018-05-29 10:12:45 -04:00
rsi_91x.h
Bluetooth: btrsi: add new rsi bluetooth driver
2018-03-13 18:37:02 +02:00
rtnetlink.h
rtnetlink: Remove VLA usage
2018-05-31 22:48:46 -04:00
sch_generic.h
net/tc: introduce TC_ACT_REINSERT.
2018-07-30 09:31:14 -07:00
scm.h
pids: Compute task_tgid using signal->leader_pid
2018-07-21 10:43:12 -05:00
secure_seq.h
seg6.h
rhashtable: split rhashtable.h
2018-06-22 13:43:27 +09:00
seg6_hmac.h
rhashtable: split rhashtable.h
2018-06-22 13:43:27 +09:00
seg6_local.h
bpf: add End.DT6 action to bpf_lwt_seg6_action helper
2018-07-31 09:22:48 +02:00
slhc_vj.h
slip: Check if rstate is initialized before uncompressing
2018-04-11 10:33:46 -04:00
smc.h
net/smc: add pnetid support for SMC-D and ISM
2018-06-30 20:42:25 +09:00
snmp.h
sock.h
net: remove bogus RCU annotations on socket.wq
2018-07-31 12:40:22 -07:00
sock_reuseport.h
bpf: Enable BPF_PROG_TYPE_SK_REUSEPORT bpf prog in reuseport selection
2018-08-11 01:58:46 +02:00
Space.h
net/mac89x0: Convert to platform_driver
2018-03-01 21:21:36 -05:00
stp.h
strparser.h
strparser: Add __strp_unpause and use it in ktls.
2018-06-06 14:07:53 -04:00
switchdev.h
switchdev: Add fdb.added_by_user to switchdev notifications
2018-05-03 13:46:47 -04:00
tcp.h
tcp, ulp: add alias for all ulp modules
2018-08-16 14:58:07 -07:00
tcp_states.h
tcp: remove the hardcode in the definition of TCPF Macro
2018-02-21 15:06:05 -05:00
timewait_sock.h
tipc.h
flow_dissector: do not rely on implicit casts
2018-05-08 00:02:41 -04:00
tls.h
net/tls: Combined memory allocation for decryption request
2018-08-13 08:41:09 -07:00
transp_v6.h
ipv6: fold sockcm_cookie into ipcm6_cookie
2018-07-07 10:58:49 +09:00
tso.h
tun_proto.h
udp.h
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
2018-07-03 10:29:26 +09:00
udp_tunnel.h
net: Convert GRO SKB handling to list_head.
2018-06-26 11:33:04 +09:00
udplite.h
udplite: fix partial checksum initialization
2018-02-16 15:57:42 -05:00
vsock_addr.h
vxlan.h
vxlan: add ttl inherit support
2018-04-17 13:53:13 -04:00
wext.h
lift handling of SIOCIW... out of dev_ioctl()
2018-01-24 19:13:45 -05:00
wimax.h
x25.h
x25device.h
xdp.h
xdp: Helper function to clear kernel pointers in xdp_frame
2018-08-10 16:12:20 +02:00
xdp_sock.h
xsk: fix potential race in SKB TX completion code
2018-07-02 18:37:12 -07:00
xfrm.h
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2018-08-15 15:04:25 -07:00