Ying Xue 258f8667a2 tipc: add lock nesting notation to quiet lockdep warning ... TIPC accept() call grabs the socket lock on a newly allocated socket while holding the socket lock on an old socket. But lockdep worries that this might be a recursive lock attempt: [ INFO: possible recursive locking detected ] --------------------------------------------- kworker/u:0/6 is trying to acquire lock: (sk_lock-AF_TIPC){+.+.+.}, at: [<c8c1226c>] accept+0x15c/0x310 [tipc] but task is already holding lock: (sk_lock-AF_TIPC){+.+.+.}, at: [<c8c12138>] accept+0x28/0x310 [tipc] other info that might help us debug this: Possible unsafe locking scenario: CPU0 ---- lock(sk_lock-AF_TIPC); lock(sk_lock-AF_TIPC); *** DEADLOCK *** May be due to missing lock nesting notation [...] Tell lockdep that this locking is safe by using lock_sock_nested(). This is similar to what was done in commit 5131a184a3 for SCTP code ("SCTP: lock_sock_nested in sctp_sock_migrate"). Also note that this is isn't something that is seen normally, as it was uncovered with some experimental work-in-progress code not yet ready for mainline. So no need for stable backports or similar of this commit. Signed-off-by: Ying Xue <ying.xue@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>		2012-12-07 17:23:23 -05:00
..
9p	The following changes since commit 4cbe5a555f:	2012-10-12 09:59:23 +09:00
802
8021q	8021q: fix vlan device to inherit the unicast filtering capability flag	2012-11-30 12:07:27 -05:00
appletalk	userns: Print out socket uids in a user namespace aware fashion.	2012-08-14 21:48:06 -07:00
atm	pppoatm: optimise PPP channel wakeups after sock_owned_by_user()	2012-12-02 00:05:20 +00:00
ax25	userns: Convert net/ax25 to use kuid_t where appropriate	2012-08-14 21:49:42 -07:00
batman-adv	batman-adv: use ETH_P_BATMAN	2012-11-30 10:50:22 +01:00
bluetooth	Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next	2012-11-21 13:03:00 -05:00
bridge	bridge: implement multicast fast leave	2012-12-05 16:24:45 -05:00
caif	caif: Remove redundant null check before kfree in cfctrl.c	2012-11-20 13:48:09 -05:00
can	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-29 12:51:17 -05:00
ceph	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2012-10-29 08:49:25 -07:00
core	net: fix some compiler warning in net/core/neighbour.c	2012-12-05 21:50:37 -05:00
dcb	net: Push capable(CAP_NET_ADMIN) into the rtnl methods	2012-11-18 20:32:44 -05:00
dccp	tcp: better retrans tracking for defer-accept	2012-11-03 14:45:00 -04:00
decnet	net: Push capable(CAP_NET_ADMIN) into the rtnl methods	2012-11-18 20:32:44 -05:00
dns_resolver	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
dsa	dsa: Hide core config options; make drivers select what they need	2012-11-26 17:10:44 -05:00
ethernet
ieee802154	6lowpan: consider checksum bytes in fragmentation threshold	2012-11-30 12:19:24 -05:00
ipv4	ipmr: advertise new mfc entries via rtnl	2012-12-04 13:08:11 -05:00
ipv6	ipv6: avoid taking locks at socket dismantle	2012-12-05 16:01:28 -05:00
ipx	userns: Print out socket uids in a user namespace aware fashion.	2012-08-14 21:48:06 -07:00
irda	irda: irttp: fix memory leak in irttp_open_tsap() error path	2012-11-28 11:25:29 -05:00
iucv
key	net: Allow userns root to control llc, netfilter, netlink, packet, and xfrm	2012-11-18 20:32:45 -05:00
l2tp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
lapb
llc	net: Allow userns root to control llc, netfilter, netlink, packet, and xfrm	2012-11-18 20:32:45 -05:00
mac80211	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2012-11-26 14:46:41 -05:00
mac802154	mac802154: use kfree_skb() instead of dev_kfree_skb()	2012-11-30 12:19:24 -05:00
netfilter	netfilter: ctnetlink: nla_policy updates	2012-12-03 15:13:10 +01:00
netlabel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-10-02 13:38:27 -07:00
netlink	net: Allow userns root to control llc, netfilter, netlink, packet, and xfrm	2012-11-18 20:32:45 -05:00
netrom	net: change return values from -EACCES to -EPERM	2012-09-21 13:58:08 -04:00
nfc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-25 12:49:17 -05:00
openvswitch	openvswitch: Use RCU callback when detaching netdevices.	2012-11-28 14:04:34 -08:00
packet	net: Allow userns root to control llc, netfilter, netlink, packet, and xfrm	2012-11-18 20:32:45 -05:00
phonet	net: Push capable(CAP_NET_ADMIN) into the rtnl methods	2012-11-18 20:32:44 -05:00
rds	net: rds: use this_cpu_* per-cpu helper	2012-11-19 18:59:44 -05:00
rfkill	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-10-02 13:38:27 -07:00
rose
rxrpc	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
sched	pkt_sched: QFQ Plus: fair-queueing service at DRR cost	2012-11-28 11:19:35 -05:00
sctp	sctp: Add support to per-association statistics via a new SCTP_GET_ASSOC_STATS call	2012-12-03 13:32:15 -05:00
sunrpc	SUNRPC: return proper errno from backchannel_rqst	2012-11-01 11:50:53 -04:00
tipc	tipc: add lock nesting notation to quiet lockdep warning	2012-12-07 17:23:23 -05:00
unix	net: Don't export sysctls to unprivileged users	2012-11-18 20:30:55 -05:00
wanrouter
wimax
wireless	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2012-11-26 14:46:41 -05:00
x25
xfrm	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2012-11-22 15:25:55 -05:00
compat.c	make get_file() return its argument	2012-09-26 21:10:25 -04:00
Kconfig	net: Add INET dependency on aes crypto for the sake of TCP fastopen.	2012-09-04 14:20:14 -04:00
Makefile	ipv6: Preserve ipv6 functionality needed by NET	2012-11-18 02:34:00 -05:00
nonet.c
socket.c	cgroup: net_cls: Rework update socket logic	2012-10-26 03:40:51 -04:00
sysctl_net.c	user_ns: get rid of duplicate code in net_ctl_permissions	2012-11-18 20:32:45 -05:00