From: Cong Wang Subject: [Patch net] tipc: orphan sock in tipc_release() Date: Mon, 3 Sep 2018 19:12:41 -0700 Message-ID: <20180904021241.11426-2-xiyou.wangcong@gmail.com> References: <20180904021241.11426-1-xiyou.wangcong@gmail.com> Cc: tipc-discussion@lists.sourceforge.net, Cong Wang , Jon Maloy , Ying Xue To: netdev@vger.kernel.org Return-path: Received: from mail-pf1-f193.google.com ([209.85.210.193]:47033 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725874AbeIDGfn (ORCPT ); Tue, 4 Sep 2018 02:35:43 -0400 Received: by mail-pf1-f193.google.com with SMTP id u24-v6so856033pfn.13 for ; Mon, 03 Sep 2018 19:12:55 -0700 (PDT) In-Reply-To: <20180904021241.11426-1-xiyou.wangcong@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: Before we unlock the sock in tipc_release(), we have to detach sk->sk_socket from sk, otherwise a parallel tipc_sk_fill_sock_diag() could stil read it after we free this socket. Fixes: c30b70deb5f4 ("tipc: implement socket diagnostics for AF_TIPC") Reported-and-tested-by: syzbot+48804b87c16588ad491d@syzkaller.appspotmail.com Cc: Jon Maloy Cc: Ying Xue Signed-off-by: Cong Wang --- net/tipc/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/tipc/socket.c b/net/tipc/socket.c index a19b2b1c77ed..b5a6635e4dfa 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -576,6 +576,7 @@ static int tipc_release(struct socket *sock) sk_stop_timer(sk, &sk->sk_timer); tipc_sk_remove(tsk); + sock_orphan(sk); /* Reject any messages that accumulated in backlog queue */ release_sock(sk); tipc_dest_list_purge(&tsk->cong_links); -- 2.14.4