From patchwork Sun Feb 26 20:17:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Mikhalitsyn X-Patchwork-Id: 13152478 X-Patchwork-Delegate: kuba@kernel.org 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 6DF51C7EE2D for ; Sun, 26 Feb 2023 20:17:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229682AbjBZURq (ORCPT ); Sun, 26 Feb 2023 15:17:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229582AbjBZURp (ORCPT ); Sun, 26 Feb 2023 15:17:45 -0500 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BAF6F14E8E for ; Sun, 26 Feb 2023 12:17:43 -0800 (PST) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 10D8E3F71C for ; Sun, 26 Feb 2023 20:17:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1677442661; bh=9/pq49ozwimVxEnGFYdfViP09nMRqPZhjqEhtsjGRMw=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=ZDIwedpX5ZaJXeTs9eW8U5dhmsOMmA6p/zpue3bonzhLk2isYJZygHA4pxj+/769I fHmA13SJtmf2zAQTpy9vicNod27SWCe/pbcg3iMSmqiYUNsiboVy75xU0+9aof9+nI z0BizynJbddGBYlp0o9bhsJ547GiVydZDjMeyDoXYigOngzq5Fx6+9SnBPKfLv/OOx SjMIcuLCWN8YL7bJ8b4na8+1EzuzuzsCWMFtwLix75XF7/Iook8I/4XKeX9bcHUK/8 fLyUQQ2s5nqFNE7m+ND8r9eRR4H2vmH63jPuicGa/UqoABGCCGPf/LaKhV/xaQf9X6 BZ+cTM4N7HpYQ== Received: by mail-ed1-f72.google.com with SMTP id h13-20020a0564020e8d00b004a26ef05c34so5482233eda.16 for ; Sun, 26 Feb 2023 12:17:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=9/pq49ozwimVxEnGFYdfViP09nMRqPZhjqEhtsjGRMw=; b=SWTm0xlkQd9uwPazC2p+gAn2zPx8sgtsl6ApSKIdUBld8GlHfNT2ByX7BqcXuKFqq3 LZ9i8iutETgBpInn3hovP+03zP+9QCH8cMt4yr2u44z2bJEqzGkRsMyo0htIIPJMRmfy 8UqjpSx5WhLxJZOngyhdgO4V+UDTrnc5StOnzuihxSzy2TOlc1NzaYnMw2d2Uoq1QfkS +htkZ3OXt5GMA1MOKGEzbIuSEbbOL9AnVSna6QorAIgiKzBEYm/JsanPnzNtSXW9htAL /F7mz+XzZClP7A6NQaXX7ps/ggWoWP+y388vzCscNqGLod3Lx7O5xzmdJzkJbat4Dacr 8RGQ== X-Gm-Message-State: AO0yUKXp8G4SQgR3RZhlj9EPhUdXuz7Wkjhl6jXd5XyW1FIoBBBJFxjo H6M7584IZ4GOmWG6/cMPgqOx64iKHewKD//NZNUuD1grlkHKl0EFiIE89huRE0mzudKhtS2dG0m OCdwVfrjdyo31M58G7T1tgHm/fQ5c3ZGgLA== X-Received: by 2002:aa7:ccd5:0:b0:4ac:bd72:e7c5 with SMTP id y21-20020aa7ccd5000000b004acbd72e7c5mr23012938edt.20.1677442660691; Sun, 26 Feb 2023 12:17:40 -0800 (PST) X-Google-Smtp-Source: AK7set/QLzUlE3acOhv46mqmlyZ8kHQPNmW84C2w7/OHzgdK3i153PU5WOejeRN6Tlj4XIUfEQKnSg== X-Received: by 2002:aa7:ccd5:0:b0:4ac:bd72:e7c5 with SMTP id y21-20020aa7ccd5000000b004acbd72e7c5mr23012923edt.20.1677442660391; Sun, 26 Feb 2023 12:17:40 -0800 (PST) Received: from amikhalitsyn.. ([2a02:8109:bd40:1414:ea8f:7f5:4586:1075]) by smtp.gmail.com with ESMTPSA id cm18-20020a0564020c9200b004af5968cb3bsm2284995edb.17.2023.02.26.12.17.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 12:17:39 -0800 (PST) From: Alexander Mikhalitsyn To: davem@davemloft.net Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Alexander Mikhalitsyn , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH net-next] scm: fix MSG_CTRUNC setting condition for SO_PASSSEC Date: Sun, 26 Feb 2023 21:17:30 +0100 Message-Id: <20230226201730.515449-1-aleksandr.mikhalitsyn@canonical.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Currently, we set MSG_CTRUNC flag is we have no msg_control buffer provided and SO_PASSCRED is set or if we have pending SCM_RIGHTS. For some reason we have no corresponding check for SO_PASSSEC. Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Signed-off-by: Alexander Mikhalitsyn --- include/net/scm.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/include/net/scm.h b/include/net/scm.h index 1ce365f4c256..585adc1346bd 100644 --- a/include/net/scm.h +++ b/include/net/scm.h @@ -105,16 +105,27 @@ static inline void scm_passec(struct socket *sock, struct msghdr *msg, struct sc } } } + +static inline bool scm_has_secdata(struct socket *sock) +{ + return test_bit(SOCK_PASSSEC, &sock->flags); +} #else static inline void scm_passec(struct socket *sock, struct msghdr *msg, struct scm_cookie *scm) { } + +static inline bool scm_has_secdata(struct socket *sock) +{ + return false; +} #endif /* CONFIG_SECURITY_NETWORK */ static __inline__ void scm_recv(struct socket *sock, struct msghdr *msg, struct scm_cookie *scm, int flags) { if (!msg->msg_control) { - if (test_bit(SOCK_PASSCRED, &sock->flags) || scm->fp) + if (test_bit(SOCK_PASSCRED, &sock->flags) || scm->fp || + scm_has_secdata(sock)) msg->msg_flags |= MSG_CTRUNC; scm_destroy(scm); return;