Jozsef Kadlecsik
7d367e0668
netfilter: ctnetlink: fix soft lockup when netlink adds new entries (v2) ...
Marcell Zambo and Janos Farago noticed and reported that when
new conntrack entries are added via netlink and the conntrack table
gets full, soft lockup happens. This is because the nf_conntrack_lock
is held while nf_conntrack_alloc is called, which is in turn wants
to lock nf_conntrack_lock while evicting entries from the full table.
The patch fixes the soft lockup with limiting the holding of the
nf_conntrack_lock to the minimum, where it's absolutely required.
It required to extend (and thus change) nf_conntrack_hash_insert
so that it makes sure conntrack and ctnetlink do not add the same entry
twice to the conntrack table.
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2012-02-24 12:24:15 +01:00
9p: Reduce object size with CONFIG_NET_9P_DEBUG
2012-01-05 10:51:44 -06:00
Bluetooth: Remove usage of __cancel_delayed_work()
2012-02-15 13:09:26 +02:00
caif-spi: Bugfix for dump upon device removal
2011-12-06 13:34:12 -05:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
af_iucv: get rid of state IUCV_SEVERED
2011-12-20 14:05:03 -05:00
netfilter: ctnetlink: fix soft lockup when netlink adds new entries (v2)
2012-02-24 12:24:15 +01:00
netns: Fail conspicously if someone uses net_generic at an inappropriate time.
2012-01-27 21:06:02 -05:00
NFC: Export a new attribute nfcid1 in target info
2012-01-04 14:30:43 -05:00
net: dont hold rtnl mutex during netlink dump callbacks
2011-05-02 15:26:28 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-12-23 17:13:56 -05:00
net/sched: add ACT_CSUM action to update packets checksums
2010-08-20 01:42:59 -07:00
net: sched: constify tcf_proto and tc_action
2011-07-06 02:52:16 -07:00
ipv6: Check RA for sllao when configuring optimistic ipv6 address (v2)
2012-01-04 15:53:20 -05:00
net: Remove __KERNEL__ cpp checks from include/net
2011-04-24 10:54:56 -07:00
af_unix: Move CINQ/COUTQ code to helpers
2011-12-30 16:45:45 -05:00
ipsec: update MAX_AH_AUTH_LEN to support sha512
2011-01-13 21:48:25 -08:00
ipv6: Use universal hash for NDISC.
2011-12-28 15:06:58 -05:00
atm: clip: Use device neigh support on top of "arp_tbl".
2011-11-30 18:51:03 -05:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
cfg80211: remove unused wext handler exports
2011-08-08 14:26:29 -04:00
kernel-doc: fix new warnings in cfg80211.h
2012-01-23 08:44:54 -08:00
doc: Update the email address for Paul Moore in various source files
2011-08-01 17:58:33 -07:00
Merge commit 'v2.6.36-rc7' into core/rcu
2010-10-07 09:43:45 +02:00
net: Add sendmmsg socket system call
2011-05-05 11:10:14 -07:00
dcb: Add stub routines for !CONFIG_DCB
2011-10-06 15:49:51 -04:00
dcb: add DCBX mode to event notifier attributes
2011-10-06 15:49:51 -04:00
decnet: Convert to use flowidn where applicable.
2011-03-12 15:08:55 -08:00
decnet: RCU conversion and get rid of dev_base_lock
2010-11-08 13:50:08 -08:00
decnet: Convert to use flowidn where applicable.
2011-03-12 15:08:55 -08:00
net: use __packed annotation
2010-06-03 03:21:52 -07:00
decnet: Convert to use flowidn where applicable.
2011-03-12 15:08:55 -08:00
dsa: Include linux/if_ether.h to fix build error
2011-12-01 11:41:06 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-12-23 17:13:56 -05:00
net: Rename the dst_opt default_mtu method to mtu
2011-11-26 14:29:50 -05:00
fib_rules: __rcu annotates ctarget
2010-10-27 11:37:32 -07:00
ipv4: reset flowi parameters on route connect
2012-02-04 19:29:48 -05:00
flow_dissector: use a 64bit load/store
2011-11-29 13:17:03 -05:00
garp: remove last synchronize_rcu() call
2011-05-12 17:46:56 -04:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
genetlink: Add genl_notify()
2011-12-03 09:35:05 -08:00
PPTP: PPP over IPv4 (Point-to-Point Tunneling Protocol)
2010-08-21 23:05:39 -07:00
ipv4: reduce percpu needs for icmpmsg mibs
2011-11-09 16:04:20 -05:00
wireless: move ieee80211chan2mhz macro
2011-11-11 12:32:50 -05:00
6LoWPAN: add fragmentation support
2011-11-14 00:19:42 -05:00
ipv6: updates to privacy addresses per RFC 4941.
2011-08-01 18:05:00 -07:00
inet: Pass flowi to ->queue_xmit().
2011-05-08 15:28:28 -07:00
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
inet, inet6: make tcp_sendmsg() and tcp_sendpage() through inet_sendmsg() and inet_sendpage()
2010-07-12 20:21:46 -07:00
net: rename sk_clone to sk_clone_lock
2011-11-08 17:07:07 -05:00
inet: add rfc 3168 extract in front of INET_ECN_encapsulate()
2011-10-22 01:25:23 -04:00
fragment: add fast path for in-order fragments
2010-06-30 13:44:29 -07:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
inet: remove rcu protection on tw_net
2011-12-14 13:34:55 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-12-02 13:49:21 -05:00
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
IPv6: Avoid taking write lock for /proc/net/ipv6_route
2011-12-30 17:07:33 -05:00
Merge branch 'nf-next' of git://1984.lsi.us.es/net-next
2011-12-25 02:21:45 -05:00
tunnels: add _rcu annotations
2010-10-25 13:09:45 -07:00
ipv4: Call fib_select_default() only when actually necessary.
2011-04-14 15:05:22 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-01-02 18:56:49 -05:00
tunnels: add __rcu annotations
2010-10-27 11:37:32 -07:00
ipv6: Add fragment reporting to ipv6_skip_exthdr().
2011-12-03 09:35:10 -08:00
net: Remove __KERNEL__ cpp checks from include/net
2011-04-24 10:54:56 -07:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
wan: make LAPB callbacks const
2011-09-16 19:20:20 -04:00
include: replace linux/module.h with "struct module" wherever possible
2011-10-31 19:32:32 -04:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
bonding,llc: Fix structure sizeof incompatibility for some PDUs
2011-05-13 15:13:24 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-01-08 13:21:22 -08:00
net: use __packed annotation
2010-06-03 03:21:52 -07:00
ipv6: Create fast inline ipv6 neigh lookup just like ipv4.
2011-12-28 15:41:23 -05:00
ipv6: Use universal hash for NDISC.
2011-12-28 15:06:58 -05:00
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
net: Kill ratelimit.h dependency in linux/net.h
2011-05-27 13:41:33 -04:00
net: Remove __KERNEL__ cpp checks from include/net
2011-04-24 10:54:56 -07:00
doc: Update the email address for Paul Moore in various source files
2011-08-01 17:58:33 -07:00
netlink: clarify attribute length check documentation
2011-11-04 17:48:23 -04:00
netprio_cgroup: fix wrong memory access when NETPRIO_CGROUP=m
2012-02-10 15:08:57 -05:00
net: ping: fix build failure
2011-05-17 14:16:58 -04:00
net: Fix range checks in tcf_valid_offset().
2010-12-21 12:43:16 -08:00
net: sched: constify tcf_proto and tc_action
2011-07-06 02:52:16 -07:00
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
include/net/raw.h: Convert raw_seq_private macro to inline
2010-09-08 13:42:22 -07:00
net: Remove __KERNEL__ cpp checks from include/net
2011-04-24 10:54:56 -07:00
net_sched: sfq: add optional RED on top of SFQ
2012-01-12 20:05:28 -08:00
cfg80211: pass DFS region to drivers through reg_notifier()
2011-11-21 16:20:41 -05:00
tcp: Change possible SYN flooding messages
2011-09-15 14:49:43 -04:00
rose: Add length checks to CALL_REQUEST parsing
2011-03-27 17:59:04 -07:00
ipv4: reset flowi parameters on route connect
2012-02-04 19:29:48 -05:00
rtnetlink: Fix problem with buffer allocation
2012-02-21 16:56:45 -05:00
net: Make qdisc_skb_cb upper size bound explicit.
2012-02-09 13:50:34 -05:00
af_unix: dont send SCM_CREDENTIALS by default
2011-09-28 13:29:50 -04:00
tcp: add const qualifiers where possible
2011-10-21 05:22:42 -04:00
Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2012-01-09 13:08:28 -08:00
net: explicitly add jump_label.h header to sock.h
2012-01-26 17:13:26 -05:00
net: Disambiguate kernel message
2012-02-01 14:41:50 -05:00
tcp buffer limitation: per-cgroup limit
2011-12-12 19:04:11 -05:00
timewait_sock: Create and use getpeer op.
2010-12-01 18:09:13 -08:00
net: relax PKTINFO non local ipv6 udp xmit check
2011-08-30 17:39:01 -04:00
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
udplite: fast-path computation of checksum coverage
2011-10-17 19:07:30 -04:00
net: wimax: Remove of unused 'rfkill_input' pointer
2011-06-24 17:50:44 -07:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
X25 remove bkl in subscription ioctls
2010-11-28 11:12:20 -08:00
net: remove ipv6_addr_copy()
2011-11-22 16:43:32 -05:00
7d367e0668