Wei Yongjun 1bc4ee4088 sctp: fix warning at inet_sock_destruct() while release sctp socket ... Commit 'net: Move rx skb_orphan call to where needed' broken sctp protocol with warning at inet_sock_destruct(). Actually, sctp can do this right with sctp_sock_rfree_frag() and sctp_skb_set_owner_r_frag() pair. sctp_sock_rfree_frag(skb); sctp_skb_set_owner_r_frag(skb, newsk); This patch not revert the commit d55d87fdff, instead remove the sctp_sock_rfree_frag() function. ------------[ cut here ]------------ WARNING: at net/ipv4/af_inet.c:151 inet_sock_destruct+0xe0/0x142() Modules linked in: sctp ipv6 dm_mirror dm_region_hash dm_log dm_multipath scsi_mod ext3 jbd uhci_hcd ohci_hcd ehci_hcd [last unloaded: scsi_wait_scan] Pid: 1808, comm: sctp_test Not tainted 2.6.31-rc2 #40 Call Trace: [<c042dd06>] warn_slowpath_common+0x6a/0x81 [<c064a39a>] ? inet_sock_destruct+0xe0/0x142 [<c042dd2f>] warn_slowpath_null+0x12/0x15 [<c064a39a>] inet_sock_destruct+0xe0/0x142 [<c05fde44>] __sk_free+0x19/0xcc [<c05fdf50>] sk_free+0x18/0x1a [<ca0d14ad>] sctp_close+0x192/0x1a1 [sctp] [<c0649f7f>] inet_release+0x47/0x4d [<c05fba4d>] sock_release+0x19/0x5e [<c05fbab3>] sock_close+0x21/0x25 [<c049c31b>] __fput+0xde/0x189 [<c049c3de>] fput+0x18/0x1a [<c049988f>] filp_close+0x56/0x60 [<c042f422>] put_files_struct+0x5d/0xa1 [<c042f49f>] exit_files+0x39/0x3d [<c043086a>] do_exit+0x1a5/0x5dd [<c04a86c2>] ? d_kill+0x35/0x3b [<c0438fa4>] ? dequeue_signal+0xa6/0x115 [<c0430d05>] do_group_exit+0x63/0x8a [<c0439504>] get_signal_to_deliver+0x2e1/0x2f9 [<c0401d9e>] do_notify_resume+0x7c/0x6b5 [<c043f601>] ? autoremove_wake_function+0x0/0x34 [<c04a864e>] ? __d_free+0x3d/0x40 [<c04a867b>] ? d_free+0x2a/0x3c [<c049ba7e>] ? vfs_write+0x103/0x117 [<c05fc8fa>] ? sys_socketcall+0x178/0x182 [<c0402a56>] work_notifysig+0x13/0x19 ---[ end trace 9db92c463e789fba ]--- Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Acked-by: Vlad Yasevich <vladislav.yasevich@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2009-07-06 12:47:08 -07:00
..
9p	net/9p: Fix crash due to bad mount parameters.	2009-07-02 13:17:01 -07:00
802	net: remove COMPAT_NET_DEV_OPS	2009-05-25 01:53:53 -07:00
8021q	8021q: Vlan driver should use rcu_barrier() on unload instead of syncronize_net()	2009-06-10 01:11:22 -07:00
appletalk	net: correct off-by-one write allocations reports	2009-06-18 00:29:12 -07:00
atm	atm: sk_wmem_alloc initial value is one	2009-06-18 00:29:12 -07:00
ax25	net: Move rx skb_orphan call to where needed	2009-06-23 16:36:25 -07:00
bluetooth	net: correct off-by-one write allocations reports	2009-06-18 00:29:12 -07:00
bridge	bridge: Use rcu_barrier() instead of syncronize_net() on unload.	2009-06-26 13:51:32 -07:00
can	can: af_can.c use rcu_barrier() on module unload.	2009-06-10 01:11:24 -07:00
core	gro: Flush GRO packets in napi_disable_pending path	2009-06-26 19:27:04 -07:00
dcb
dccp	ipv6: Use correct data types for ICMPv6 type and code	2009-06-23 04:31:07 -07:00
decnet	decnet: Use rcu_barrier() on module unload.	2009-06-26 13:51:27 -07:00
dsa	dsa: fix 88e6xxx statistics counter snapshotting	2009-07-05 18:03:35 -07:00
econet	net: sk_wmem_alloc has initial value of one, not zero	2009-06-17 04:31:25 -07:00
ethernet	net: remove COMPAT_NET_DEV_OPS	2009-05-25 01:53:53 -07:00
ieee802154	nl802154: add module license and description	2009-06-29 18:20:28 +04:00
ipv4	xfrm4: fix the ports decode of sctp protocol	2009-07-03 19:10:06 -07:00
ipv6	IPv6: preferred lifetime of address not getting updated	2009-07-03 19:10:13 -07:00
ipx	net: correct off-by-one write allocations reports	2009-06-18 00:29:12 -07:00
irda	net: Move rx skb_orphan call to where needed	2009-06-23 16:36:25 -07:00
iucv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-06-22 11:57:09 -07:00
key	net: correct off-by-one write allocations reports	2009-06-18 00:29:12 -07:00
lapb
llc	net: correct off-by-one write allocations reports	2009-06-18 00:29:12 -07:00
mac80211	mac80211: Use rcu_barrier() on unload.	2009-06-26 13:51:36 -07:00
netfilter	netfilter: xtables: conntrack match revision 2	2009-06-29 14:31:46 +02:00
netlabel	netlabel: Use genl_register_family_with_ops()	2009-05-21 16:50:24 -07:00
netlink	net: correct off-by-one write allocations reports	2009-06-18 00:29:12 -07:00
netrom	net: correct off-by-one write allocations reports	2009-06-18 00:29:12 -07:00
packet	net: correct off-by-one write allocations reports	2009-06-18 00:29:12 -07:00
phonet	Phonet: generate Netlink RTM_DELADDR when destroying a device	2009-06-25 02:58:16 -07:00
rds	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-05-18 21:08:20 -07:00
rfkill	rfkill: export persistent attribute in sysfs	2009-06-19 11:50:18 -04:00
rose	net: correct off-by-one write allocations reports	2009-06-18 00:29:12 -07:00
rxrpc	RxRPC: Don't attempt to reuse aborted connections	2009-06-16 21:20:14 -07:00
sched	net: correct off-by-one write allocations reports	2009-06-18 00:29:12 -07:00
sctp	sctp: fix warning at inet_sock_destruct() while release sctp socket	2009-07-06 12:47:08 -07:00
sunrpc	sunrpc: Use rcu_barrier() on unload.	2009-06-26 13:51:34 -07:00
tipc	tipc: Use genl_register_family_with_ops()	2009-05-21 16:50:23 -07:00
unix	net: correct off-by-one write allocations reports	2009-06-18 00:29:12 -07:00
wanrouter	wanrouter: fix sparse warnings: context imbalance	2009-02-26 23:13:36 -08:00
wimax	wimax: fix warning caused by not checking retval of rfkill_set_hw_state()	2009-06-11 11:12:48 -07:00
wireless	cfg80211: validate station settings	2009-06-19 11:50:24 -04:00
x25	net: correct off-by-one write allocations reports	2009-06-18 00:29:12 -07:00
xfrm	xfrm: use xfrm_addr_cmp() instead of compare addresses directly	2009-06-29 19:41:46 -07:00
compat.c
Kconfig	net: add IEEE 802.15.4 socket family implementation	2009-06-09 05:25:32 -07:00
Makefile	net: add IEEE 802.15.4 socket family implementation	2009-06-09 05:25:32 -07:00
nonet.c
socket.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-04-06 18:05:43 -07:00
sysctl_net.c	net: sysctl_net - use net_eq to compare nets	2009-03-16 16:23:30 +01:00
TUNABLE