• Parthasarathy Bhuvaragan's avatar
    tipc: Revert "tipc: use existing sk_write_queue for outgoing packet chain" · f214fc40
    Parthasarathy Bhuvaragan authored
    reverts commit 94153e36 ("tipc: use existing sk_write_queue for
    outgoing packet chain")
    
    In Commit 94153e36, we assume that we fill & empty the socket's
    sk_write_queue within the same lock_sock() session.
    
    This is not true if the link is congested. During congestion, the
    socket lock is released while we wait for the congestion to cease.
    This implementation causes a nullptr exception, if the user space
    program has several threads accessing the same socket descriptor.
    
    Consider two threads of the same program performing the following:
         Thread1                                  Thread2
    --------------------                    ----------------------
    Enter tipc_sendmsg()                    Enter tipc_sendmsg()
    lock_sock()                             lock_sock()
    Enter tipc_link_xmit(), ret=ELINKCONG   spin on socket lock..
    sk_wait_event()                             :
    release_sock()                          grab socket lock
        :                                   Enter tipc_link_xmit(), ret=0
        :                                   release_sock()
    Wakeup after congestion
    lock_sock()
    skb = skb_peek(pktchain);
    !! TIPC_SKB_CB(skb)->wakeup_pending = tsk->link_cong;
    
    In this case, the second thread transmits the buffers belonging to
    both thread1 and thread2 successfully. When the first thread wakeup
    after the congestion it assumes that the pktchain is intact and
    operates on the skb's in it, which leads to the following exception:
    
    [2102.439969] BUG: unable to handle kernel NULL pointer dereference at 00000000000000d0
    [2102.440074] IP: [<ffffffffa005f330>] __tipc_link_xmit+0x2b0/0x4d0 [tipc]
    [2102.440074] PGD 3fa3f067 PUD 3fa6b067 PMD 0
    [2102.440074] Oops: 0000 [#1] SMP
    [2102.440074] CPU: 2 PID: 244 Comm: sender Not tainted 3.12.28 #1
    [2102.440074] RIP: 0010:[<ffffffffa005f330>]  [<ffffffffa005f330>] __tipc_link_xmit+0x2b0/0x4d0 [tipc]
    [...]
    [2102.440074] Call Trace:
    [2102.440074]  [<ffffffff8163f0b9>] ? schedule+0x29/0x70
    [2102.440074]  [<ffffffffa006a756>] ? tipc_node_unlock+0x46/0x170 [tipc]
    [2102.440074]  [<ffffffffa005f761>] tipc_link_xmit+0x51/0xf0 [tipc]
    [2102.440074]  [<ffffffffa006d8ae>] tipc_send_stream+0x11e/0x4f0 [tipc]
    [2102.440074]  [<ffffffff8106b150>] ? __wake_up_sync+0x20/0x20
    [2102.440074]  [<ffffffffa006dc9c>] tipc_send_packet+0x1c/0x20 [tipc]
    [2102.440074]  [<ffffffff81502478>] sock_sendmsg+0xa8/0xd0
    [2102.440074]  [<ffffffff81507895>] ? release_sock+0x145/0x170
    [2102.440074]  [<ffffffff815030d8>] ___sys_sendmsg+0x3d8/0x3e0
    [2102.440074]  [<ffffffff816426ae>] ? _raw_spin_unlock+0xe/0x10
    [2102.440074]  [<ffffffff81115c2a>] ? handle_mm_fault+0x6ca/0x9d0
    [2102.440074]  [<ffffffff8107dd65>] ? set_next_entity+0x85/0xa0
    [2102.440074]  [<ffffffff816426de>] ? _raw_spin_unlock_irq+0xe/0x20
    [2102.440074]  [<ffffffff8107463c>] ? finish_task_switch+0x5c/0xc0
    [2102.440074]  [<ffffffff8163ea8c>] ? __schedule+0x34c/0x950
    [2102.440074]  [<ffffffff81504e12>] __sys_sendmsg+0x42/0x80
    [2102.440074]  [<ffffffff81504e62>] SyS_sendmsg+0x12/0x20
    [2102.440074]  [<ffffffff8164aed2>] system_call_fastpath+0x16/0x1b
    
    In this commit, we maintain the skb list always in the stack.
    Signed-off-by: default avatarParthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com>
    Acked-by: default avatarYing Xue <ying.xue@windriver.com>
    Acked-by: default avatarJon Maloy <jon.maloy@ericsson.com>
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    f214fc40
socket.c 72.1 KB