From patchwork Tue Sep 29 10:58:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 263355 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BDD86C4727F for ; Tue, 29 Sep 2020 11:12:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 74C7F21D46 for ; Tue, 29 Sep 2020 11:12:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601377964; bh=JDZ3+6YB0uGguex7VGORBz61ij0uqFHkQ3vhlh0VuwY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KMshixd6W/6rPiyyD908z2CX4fDMk6x2w7noDagFW69wx2l7W5dQKVvXsS+X1ccL6 5O2im3cec8f8sMHh/Kvpx4kJR1MiseImNq7VyX81zha/WtF/I4OpPVj1tBlRSfDP9p HNlZCVvLtEkUAmwu2M/RL6cjo8wyBExwuuOLIlUc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728866AbgI2LMd (ORCPT ); Tue, 29 Sep 2020 07:12:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:54340 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729325AbgI2LMb (ORCPT ); Tue, 29 Sep 2020 07:12:31 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9AF7F20848; Tue, 29 Sep 2020 11:12:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601377951; bh=JDZ3+6YB0uGguex7VGORBz61ij0uqFHkQ3vhlh0VuwY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UatfUneAoY56H3rdZO5Jc+niozuClR+LM6SZjfCtN9rbqPoSweEimhY0jx0xYj78r LA7cNX9V6RMRm3mDGL3ArQCKZY0PBhxNbbkD6HOPyS3p3uIh+mObATrdkq/sDqDHvG tODNY/TGi064F1hFJNYrnyMncVgIqMVivem6B8zM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tetsuo Handa , Ying Xue , "David S. Miller" Subject: [PATCH 4.14 010/166] tipc: fix shutdown() of connection oriented socket Date: Tue, 29 Sep 2020 12:58:42 +0200 Message-Id: <20200929105935.710872245@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929105935.184737111@linuxfoundation.org> References: <20200929105935.184737111@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tetsuo Handa [ Upstream commit a4b5cc9e10803ecba64a7d54c0f47e4564b4a980 ] I confirmed that the problem fixed by commit 2a63866c8b51a3f7 ("tipc: fix shutdown() of connectionless socket") also applies to stream socket. ---------- #include #include #include int main(int argc, char *argv[]) { int fds[2] = { -1, -1 }; socketpair(PF_TIPC, SOCK_STREAM /* or SOCK_DGRAM */, 0, fds); if (fork() == 0) _exit(read(fds[0], NULL, 1)); shutdown(fds[0], SHUT_RDWR); /* This must make read() return. */ wait(NULL); /* To be woken up by _exit(). */ return 0; } ---------- Since shutdown(SHUT_RDWR) should affect all processes sharing that socket, unconditionally setting sk->sk_shutdown to SHUTDOWN_MASK will be the right behavior. Signed-off-by: Tetsuo Handa Acked-by: Ying Xue Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/tipc/socket.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -2126,10 +2126,7 @@ static int tipc_shutdown(struct socket * lock_sock(sk); __tipc_shutdown(sock, TIPC_CONN_SHUTDOWN); - if (tipc_sk_type_connectionless(sk)) - sk->sk_shutdown = SHUTDOWN_MASK; - else - sk->sk_shutdown = SEND_SHUTDOWN; + sk->sk_shutdown = SHUTDOWN_MASK; if (sk->sk_state == TIPC_DISCONNECTING) { /* Discard any unreceived messages */