Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3366986pxf; Mon, 5 Apr 2021 10:08:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwD2EquDDH1MTKwWLkK2SW0+JMJ8EOBOhuXMpbLMt/7ZiDJ0GaLXreHwvCWJgK+ITDzdjkB X-Received: by 2002:a05:6402:8c2:: with SMTP id d2mr33256915edz.4.1617642525317; Mon, 05 Apr 2021 10:08:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617642525; cv=none; d=google.com; s=arc-20160816; b=Qd5S4c9v9MrRUtnykcUkFf0tLv6VP5uZ4UXi2BBoAu8Klss3GQJ3UygUmz1W2+/ReT Ab97yRVPLvg0n7fYu31+wx1+Y36mLHJNQrZuRbgL4ZDuKxxH3wYklpRVa1iZ23zwWDcP Z4sAB2QSMsTFoYrzjlBkuf92a1/xB/wsUSx7Yx/I6LSOlDCSPtB7YZpyGGkxEc49nTO8 NPDXjUd2vIeuNfBvr4xfWp3B++3qLXybhfEsKIhH0QBPaACiT/vecu11KR1i5W7F5Y2q 3pKalq/FZEavS/gkuafOfrOCuQfsm1YtuC3S5Gl5JuBn1R9xGFSKzYcjFf576xkCpK/T MRNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YE61NPKHOs4b7vJcHxBwm7p07/G/YSg8FLa1lb2/m9Q=; b=SFPuqjSQF+j1W0501hHt2lk02t/oW41FcSQx7X6lc/zHpiIdfq2jg4uv9kgrIxxqft WpsLUBbtNVxQ+piRipPqddWZwgeMMFeFQ9IqrcujZT3gxjFEV7xb2Wb667Zhhf0w9MEA JL87FFTF+jf3Og6kq/gbPGhQPte7hfgV/bBnmjlOmlqzQKg/a37prtl9Bvf3lj1oOyUG OQmpE4Oa5A+zkmLQ/ldBWslojglnPWHS2+3Eir7THeCveyzIkOONUnXdBoS3LnI34+g9 KSIHqEn8cu5nJUxGHa/Q8kHRpnmpyQRfXb1Hk20yyGqh/sCVFFhIQo1AEpiMFMkAd+Gg oOSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=SnFxbhuU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v27si201823eja.407.2021.04.05.10.08.22; Mon, 05 Apr 2021 10:08:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=SnFxbhuU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240833AbhDEJTN (ORCPT + 99 others); Mon, 5 Apr 2021 05:19:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:34084 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239929AbhDEJO2 (ORCPT ); Mon, 5 Apr 2021 05:14:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D83AB60FE4; Mon, 5 Apr 2021 09:14:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617614061; bh=ssoKzKFC+66OBKC5z+OK6y19dVXJjX1i3Snn7lGXxfI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SnFxbhuUc/TPyL6uxEX1RQ6907lpdLqzfZcp8bO2TzFDtuotKD9MR80m9W5p6IIKf HvPNbtYvkQWD/4gqZ2UVk6T2kBvqGHGqze4MsUaY2KDIuqIA1OYRG5mZTawZec4CGL mUI+rbO84IIfb2B83Xd6xh4Cp/GnKDxcPI8UObCw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefan Metzmacher , Jens Axboe , Sasha Levin Subject: [PATCH 5.11 034/152] io_uring: imply MSG_NOSIGNAL for send[msg]()/recv[msg]() calls Date: Mon, 5 Apr 2021 10:53:03 +0200 Message-Id: <20210405085035.360327580@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210405085034.233917714@linuxfoundation.org> References: <20210405085034.233917714@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stefan Metzmacher [ Upstream commit 76cd979f4f38a27df22efb5773a0d567181a9392 ] We never want to generate any SIGPIPE, -EPIPE only is much better. Signed-off-by: Stefan Metzmacher Link: https://lore.kernel.org/r/38961085c3ec49fd21550c7788f214d1ff02d2d4.1615908477.git.metze@samba.org Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- fs/io_uring.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index aaf9b5d49c17..26b4af9831da 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -4648,7 +4648,7 @@ static int io_sendmsg(struct io_kiocb *req, bool force_nonblock, kmsg = &iomsg; } - flags = req->sr_msg.msg_flags; + flags = req->sr_msg.msg_flags | MSG_NOSIGNAL; if (flags & MSG_DONTWAIT) req->flags |= REQ_F_NOWAIT; else if (force_nonblock) @@ -4692,7 +4692,7 @@ static int io_send(struct io_kiocb *req, bool force_nonblock, msg.msg_controllen = 0; msg.msg_namelen = 0; - flags = req->sr_msg.msg_flags; + flags = req->sr_msg.msg_flags | MSG_NOSIGNAL; if (flags & MSG_DONTWAIT) req->flags |= REQ_F_NOWAIT; else if (force_nonblock) @@ -4886,7 +4886,7 @@ static int io_recvmsg(struct io_kiocb *req, bool force_nonblock, 1, req->sr_msg.len); } - flags = req->sr_msg.msg_flags; + flags = req->sr_msg.msg_flags | MSG_NOSIGNAL; if (flags & MSG_DONTWAIT) req->flags |= REQ_F_NOWAIT; else if (force_nonblock) @@ -4944,7 +4944,7 @@ static int io_recv(struct io_kiocb *req, bool force_nonblock, msg.msg_iocb = NULL; msg.msg_flags = 0; - flags = req->sr_msg.msg_flags; + flags = req->sr_msg.msg_flags | MSG_NOSIGNAL; if (flags & MSG_DONTWAIT) req->flags |= REQ_F_NOWAIT; else if (force_nonblock) -- 2.30.1