From patchwork Wed Aug 5 12:25:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rouven Czerwinski X-Patchwork-Id: 262698 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=-13.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, 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 A13C6C433DF for ; Wed, 5 Aug 2020 19:59:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8AFC422CA1 for ; Wed, 5 Aug 2020 19:59:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729736AbgHET6j (ORCPT ); Wed, 5 Aug 2020 15:58:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727922AbgHEQmM (ORCPT ); Wed, 5 Aug 2020 12:42:12 -0400 X-Greylist: delayed 574 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Wed, 05 Aug 2020 05:40:14 PDT Received: from magratgarlick.emantor.de (magratgarlick.emantor.de [IPv6:2a01:4f8:c17:c88::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F570C034603; Wed, 5 Aug 2020 05:40:10 -0700 (PDT) Received: by magratgarlick.emantor.de (Postfix, from userid 114) id 4C73A10D01B; Wed, 5 Aug 2020 14:25:31 +0200 (CEST) Received: from localhost (200116b828fb3e0270a11fb9006029e2.dip.versatel-1u1.de [IPv6:2001:16b8:28fb:3e02:70a1:1fb9:60:29e2]) by magratgarlick.emantor.de (Postfix) with ESMTPSA id BC6D710D014; Wed, 5 Aug 2020 14:25:30 +0200 (CEST) From: Rouven Czerwinski To: Boris Pismenny , Aviad Yehezkel , John Fastabend , Daniel Borkmann , Jakub Kicinski , "David S. Miller" Cc: Rouven Czerwinski , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] net: tls: allow MSG_CMSG_COMPAT in sendmsg Date: Wed, 5 Aug 2020 14:25:04 +0200 Message-Id: <20200805122501.4856-2-r.czerwinski@pengutronix.de> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200805122501.4856-1-r.czerwinski@pengutronix.de> References: <20200805122501.4856-1-r.czerwinski@pengutronix.de> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The MSG_CMSG_COMPAT flag is valid if the system has CONFIG_COMPAT enabled and a 32bit userspace. Signed-off-by: Rouven Czerwinski --- net/tls/tls_sw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 24f64bc0de18..a332ae123bda 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -935,7 +935,8 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) int ret = 0; int pending; - if (msg->msg_flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL)) + if (msg->msg_flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL | + MSG_CMSG_COMPAT)) return -EOPNOTSUPP; mutex_lock(&tls_ctx->tx_lock);