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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 56139EB64DA for ; Wed, 19 Jul 2023 11:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=b6jtiezrHbpPbHdDJAQk+MY/BXvcSOqXXZBiE03yA8s=; b=LDGqG5MXypGoOywoWOdulD5YmP R68rZGN4E2KHkup44lbufBKR0bdSRmzZ7wza4omNpv4b68/KBoq29tjs/RnNZFtKtT9uQlbxM9C/j iDeg6e/OfkRKtwvBC9IScrAWG2sfZRC/4WKXTdWBIsf7rzRQ81FA8nBwgK85KWP1ODpnVXAOp8loA aXtXqZF9/Li2XS1U1PKzqPS3I1bnIHtOk+xXN3HZE7+snqZSdDoVE5Cicn9U/yyQwkeTt3KqXd89k s/RWrcGPeLZ4u/OL/SFueG+7Yv89tVfpofRoWu9A3xYDyWaFWxkwdaRQP2ycBmsueRirx/yjjo1at giDhgMaA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qM5W1-007H4P-0g; Wed, 19 Jul 2023 11:38:45 +0000 Received: from smtp-out2.suse.de ([2001:67c:2178:6::1d]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qM5Vy-007H1x-2H for linux-nvme@lists.infradead.org; Wed, 19 Jul 2023 11:38:44 +0000 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id C12051FEB3; Wed, 19 Jul 2023 11:38:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1689766720; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b6jtiezrHbpPbHdDJAQk+MY/BXvcSOqXXZBiE03yA8s=; b=i6dHIDC1P8dXm4raN+9ug2bYvOg0HUsi6A4/TZjO7NdhbJN5RRBtF2rt7VIB3sNQIhshqw +K62c050L+EYL3Y8i4G081iqpc8HzM58ZjFr6MrQ0SRNPxmO3r3AmjSPKBrqzoa+r+KIva splwbIvVAJNepKHmhFSeRU1Dj4GmSRk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1689766720; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b6jtiezrHbpPbHdDJAQk+MY/BXvcSOqXXZBiE03yA8s=; b=B1FMkEpFBFl/GVgW1AGeHoki7FpKax3Zf33QYpUxlWPGgfNBltCl2gkxo+Q1NSR1mAd0Tv cN10bXhwZCuCoaAA== Received: from adalid.arch.suse.de (adalid.arch.suse.de [10.161.8.13]) by relay2.suse.de (Postfix) with ESMTP id A99A82C145; Wed, 19 Jul 2023 11:38:40 +0000 (UTC) Received: by adalid.arch.suse.de (Postfix, from userid 16045) id 9C9C951C9ECF; Wed, 19 Jul 2023 13:38:40 +0200 (CEST) From: Hannes Reinecke To: Christoph Hellwig Cc: Sagi Grimberg , Keith Busch , linux-nvme@lists.infradead.org, Jakub Kicinski , Eric Dumazet , Paolo Abeni , netdev@vger.kernel.org, Hannes Reinecke Subject: [PATCH 2/6] net/tls: handle MSG_EOR for tls_device TX flow Date: Wed, 19 Jul 2023 13:38:32 +0200 Message-Id: <20230719113836.68859-3-hare@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230719113836.68859-1-hare@suse.de> References: <20230719113836.68859-1-hare@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230719_043842_903104_35560501 X-CRM114-Status: GOOD ( 12.70 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org tls_push_data() MSG_MORE, but bails out on MSG_EOR. Seeing that MSG_EOR is basically the opposite of MSG_MORE this patch adds handling MSG_EOR by treating it as the absence of MSG_MORE. Consequently we should return an error when both are set. Cc: Jakub Kicinski Cc: netdev@vger.kernel.org Signed-off-by: Hannes Reinecke --- net/tls/tls_device.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c index 2021fe557e50..5df18f696d7f 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c @@ -441,9 +441,13 @@ static int tls_push_data(struct sock *sk, long timeo; if (flags & - ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL | MSG_SPLICE_PAGES)) + ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL | + MSG_SPLICE_PAGES | MSG_EOR)) return -EOPNOTSUPP; + if ((flags & (MSG_MORE | MSG_EOR)) == (MSG_MORE | MSG_EOR)) + return -EINVAL; + if (unlikely(sk->sk_err)) return -sk->sk_err; -- 2.35.3