linux.git/net/sctp, branch v2.6.31

sctp: fix missing destroy of percpu counter variable in sctp_proc_exit()

2009-08-10T04:45:43+00:00

Commit 1748376b6626acf59c24e9592ac67b3fe2a0e026,
	net: Use a percpu_counter for sockets_allocated

added percpu_counter function calls to sctp_proc_init code path, but
forgot to add them to sctp_proc_exit().  This resulted in a following
Ooops when performing this test
	# modprobe sctp
	# rmmod -f sctp
	# modprobe sctp

[  573.862512] BUG: unable to handle kernel paging request at f8214a24
[  573.862518] IP: [] __percpu_counter_init+0x3f/0x70
[  573.862530] *pde = 37010067 *pte = 00000000
[  573.862534] Oops: 0002 [#1] SMP
[  573.862537] last sysfs file: /sys/module/libcrc32c/initstate
[  573.862540] Modules linked in: sctp(+) crc32c libcrc32c binfmt_misc bridge
stp bnep lp snd_hda_codec_analog snd_hda_intel snd_hda_codec snd_hwdep
snd_pcm_oss snd_mixer_oss arc4 joydev snd_pcm ecb pcmcia snd_seq_dummy
snd_seq_oss iwlagn iwlcore snd_seq_midi snd_rawmidi snd_seq_midi_event
yenta_socket rsrc_nonstatic thinkpad_acpi snd_seq snd_timer snd_seq_device
mac80211 psmouse sdhci_pci sdhci nvidia(P) ppdev video snd soundcore serio_raw
pcspkr iTCO_wdt iTCO_vendor_support led_class ricoh_mmc pcmcia_core intel_agp
nvram agpgart usbhid parport_pc parport output snd_page_alloc cfg80211 btusb
ohci1394 ieee1394 e1000e [last unloaded: sctp]
[  573.862589]
[  573.862593] Pid: 5373, comm: modprobe Tainted: P  R        (2.6.31-rc3 #6)
7663B15
[  573.862596] EIP: 0060:[] EFLAGS: 00010286 CPU: 1
[  573.862599] EIP is at __percpu_counter_init+0x3f/0x70
[  573.862602] EAX: f8214a20 EBX: f80faa14 ECX: c48c0000 EDX: f80faa20
[  573.862604] ESI: f80a7000 EDI: 00000000 EBP: f69d5ef0 ESP: f69d5eec
[  573.862606]  DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
[  573.862610] Process modprobe (pid: 5373, ti=f69d4000 task=c2130c70
task.ti=f69d4000)
[  573.862612] Stack:
[  573.862613]  00000000 f69d5f18 f80a70a8 f80fa9fc 00000000 fffffffc f69d5f30
c018e2d4
[  573.862619] <0> 00000000 f80a7000 00000000 f69d5f88 c010112b 00000000
c07029c0 fffffffb
[  573.862626] <0> 00000000 f69d5f38 c018f83f f69d5f54 c0557cad f80fa860
00000001 c07010c0
[  573.862634] Call Trace:
[  573.862644]  [] ? sctp_init+0xa8/0x7d4 [sctp]
[  573.862650]  [] ? marker_update_probe_range+0x184/0x260
[  573.862659]  [] ? sctp_init+0x0/0x7d4 [sctp]
[  573.862662]  [] ? do_one_initcall+0x2b/0x160
[  573.862666]  [] ? tracepoint_module_notify+0x2f/0x40
[  573.862671]  [] ? notifier_call_chain+0x2d/0x70
[  573.862678]  [] ? __blocking_notifier_call_chain+0x4d/0x60
[  573.862682]  [] ? sys_init_module+0xb1/0x1f0
[  573.862686]  [] ? sysenter_do_call+0x12/0x28
[  573.862688] Code: 89 48 08 b8 04 00 00 00 e8 df aa ec ff ba f4 ff ff ff 85
c0 89 43 14 74 31 b8 b0 18 71 c0 e8 19 b9 24 00 a1 c4 18 71 c0 8d 53 0c <89> 50
04 89 43 0c b8 b0 18 71 c0 c7 43 10 c4 18 71 c0 89 15 c4
[  573.862725] EIP: [] __percpu_counter_init+0x3f/0x70 SS:ESP
0068:f69d5eec
[  573.862730] CR2: 00000000f8214a24
[  573.862734] ---[ end trace 39c4e0b55e7cf54d ]---

Signed-off-by: Rafael Laufer 
Signed-off-by: Vlad Yasevich 
Signed-off-by: David S. Miller

sctp: fix warning at inet_sock_destruct() while release sctp socket

2009-07-06T19:47:08+00:00

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 d55d87fdff8252d0e2f7c28c2d443aee17e9d70f,
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:
 [] warn_slowpath_common+0x6a/0x81
 [] ? inet_sock_destruct+0xe0/0x142
 [] warn_slowpath_null+0x12/0x15
 [] inet_sock_destruct+0xe0/0x142
 [] __sk_free+0x19/0xcc
 [] sk_free+0x18/0x1a
 [] sctp_close+0x192/0x1a1 [sctp]
 [] inet_release+0x47/0x4d
 [] sock_release+0x19/0x5e
 [] sock_close+0x21/0x25
 [] __fput+0xde/0x189
 [] fput+0x18/0x1a
 [] filp_close+0x56/0x60
 [] put_files_struct+0x5d/0xa1
 [] exit_files+0x39/0x3d
 [] do_exit+0x1a5/0x5dd
 [] ? d_kill+0x35/0x3b
 [] ? dequeue_signal+0xa6/0x115
 [] do_group_exit+0x63/0x8a
 [] get_signal_to_deliver+0x2e1/0x2f9
 [] do_notify_resume+0x7c/0x6b5
 [] ? autoremove_wake_function+0x0/0x34
 [] ? __d_free+0x3d/0x40
 [] ? d_free+0x2a/0x3c
 [] ? vfs_write+0x103/0x117
 [] ? sys_socketcall+0x178/0x182
 [] work_notifysig+0x13/0x19
---[ end trace 9db92c463e789fba ]---

Signed-off-by: Wei Yongjun 
Acked-by: Herbert Xu 
Acked-by: Vlad Yasevich 
Signed-off-by: David S. Miller

sctp: xmit sctp packet always return no route error

2009-06-30T02:41:53+00:00

Commit 'net: skb->dst accessors'(adf30907d63893e4208dfe3f5c88ae12bc2f25d5)
broken the sctp protocol stack, the sctp packet can never be sent out after
Eric Dumazet's patch, which have typo in the sctp code.

Signed-off-by: Wei Yongjun 
Acked-by: Eric Dumazet 
Acked-by: Vlad Yasevich 
Signed-off-by: David S. Miller

ipv6: Use correct data types for ICMPv6 type and code

2009-06-23T11:31:07+00:00

Change all the code that deals directly with ICMPv6 type and code
values to use u8 instead of a signed int as that's the actual data
type.

Signed-off-by: Brian Haley 
Signed-off-by: David S. Miller

net: correct off-by-one write allocations reports

2009-06-18T07:29:12+00:00

commit 2b85a34e911bf483c27cfdd124aeb1605145dc80
(net: No more expensive sock_hold()/sock_put() on each tx)
changed initial sk_wmem_alloc value.

We need to take into account this offset when reporting
sk_wmem_alloc to user, in PROC_FS files or various
ioctls (SIOCOUTQ/TIOCOUTQ)

Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

sctp: protocol.c call rcu_barrier() on unload.

2009-06-10T08:11:25+00:00

On module unload call rcu_barrier(), this is needed as synchronize_rcu()
is not strong enough.  The kmem_cache_destroy() does invoke
synchronize_rcu() but it does not provide same protection.

Signed-off-by: Jesper Dangaard Brouer 
Acked-by: Vlad Yasevich 
Signed-off-by: David S. Miller

sctp: Use frag list abstraction interfaces.

2009-06-09T07:24:07+00:00

Signed-off-by: David S. Miller

sctp: support non-blocking version of the new sctp_connectx() API

2009-06-03T13:14:47+00:00

Prior implementation of the new sctp_connectx() call that returns
an association ID did not work correctly on non-blocking socket.
This is because we could not return both a EINPROGRESS error and
an association id.  This is a new implementation that supports this.

Originally from Ivan Skytte Jørgensen

sctp: fix to choose alternate destination when retransmit ASCONF chunk

2009-06-03T13:14:46+00:00

RFC 5061 Section 5.1 ASCONF Chunk Procedures said:

B4)  Re-transmit the ASCONF Chunk last sent and if possible choose an
     alternate destination address (please refer to [RFC4960],
     Section 6.4.1).  An endpoint MUST NOT add new parameters to this
     chunk; it MUST be the same (including its Sequence Number) as
     the last ASCONF sent.  An endpoint MAY, however, bundle an
     additional ASCONF with new ASCONF parameters with the next
     Sequence Number.  For details, see Section 5.5.

This patch fix to choose an alternate destination address when
re-transmit the ASCONF chunk, with some dup codes cleanup.

Signed-off-by: Wei Yongjun 
Signed-off-by: Vlad Yasevich

sctp: fix sack_timeout sysctl min and max types

2009-06-03T13:14:46+00:00

sctp_sack_timeout is defined as int, but the sysctl's maxsize is set
to sizeof(long) and the min/max are defined as long.

Signed-off-by: jean-mickael.guerin@6wind.com
Signed-off-by: Vlad Yasevich