From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79EF3C636D4 for ; Thu, 9 Feb 2023 11:31:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231415AbjBILa6 (ORCPT ); Thu, 9 Feb 2023 06:30:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231518AbjBIL3r (ORCPT ); Thu, 9 Feb 2023 06:29:47 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 813CB5A9C9; Thu, 9 Feb 2023 03:21:38 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6AB87616A8; Thu, 9 Feb 2023 11:20:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CAA49C4339C; Thu, 9 Feb 2023 11:20:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675941646; bh=9VEO9pRwOJ9ghSVUE5fqmvAsIdGwV808Rjb7kQnwxFg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oF30vGR4pNrU4BKooQ3wdkfiyzyg44mjUEYKy7z+N35VIcXB3AvhXACic/87d+9oB I3CiONLzk7jdWgZP9xs4/vI6+Qxxzeu7iMbLHYbtQZn8HFjOpMp8ZG6g47+FQHCVsI 28IIpyYoZynUC7B2WOZ/Gau+YOkj3OmHK5SMybzXOUMrLy7hEM+Pi1WSe2WQko3Uw0 wf56imxRC6AF0JCdqrqpkGMRf/w6+uvWhcDdX7hOiX5Uz6oYWDxCbbbzGG3YP+sYy5 e60mlMZF+twnpDNJlrKy8E60BcnDGZrEGNgeJCpP2T3uqCveHed69E000ApTC+je6Q q+CnyDoFJ8tfw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hyunwoo Kim , Kuniyuki Iwashima , Jakub Kicinski , Sasha Levin , davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, linux-hams@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 2/5] net/rose: Fix to not accept on connected socket Date: Thu, 9 Feb 2023 06:20:24 -0500 Message-Id: <20230209112042.1893375-2-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230209112042.1893375-1-sashal@kernel.org> References: <20230209112042.1893375-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hyunwoo Kim [ Upstream commit 14caefcf9837a2be765a566005ad82cd0d2a429f ] If you call listen() and accept() on an already connect()ed rose socket, accept() can successfully connect. This is because when the peer socket sends data to sendmsg, the skb with its own sk stored in the connected socket's sk->sk_receive_queue is connected, and rose_accept() dequeues the skb waiting in the sk->sk_receive_queue. This creates a child socket with the sk of the parent rose socket, which can cause confusion. Fix rose_listen() to return -EINVAL if the socket has already been successfully connected, and add lock_sock to prevent this issue. Signed-off-by: Hyunwoo Kim Reviewed-by: Kuniyuki Iwashima Link: https://lore.kernel.org/r/20230125105944.GA133314@ubuntu Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/rose/af_rose.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index b53468edf35a6..ac2ea4ebf7c7c 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c @@ -490,6 +490,12 @@ static int rose_listen(struct socket *sock, int backlog) { struct sock *sk = sock->sk; + lock_sock(sk); + if (sock->state != SS_UNCONNECTED) { + release_sock(sk); + return -EINVAL; + } + if (sk->sk_state != TCP_LISTEN) { struct rose_sock *rose = rose_sk(sk); @@ -499,8 +505,10 @@ static int rose_listen(struct socket *sock, int backlog) memset(rose->dest_digis, 0, AX25_ADDR_LEN * ROSE_MAX_DIGIS); sk->sk_max_ack_backlog = backlog; sk->sk_state = TCP_LISTEN; + release_sock(sk); return 0; } + release_sock(sk); return -EOPNOTSUPP; } -- 2.39.0