From mboxrd@z Thu Jan 1 00:00:00 1970 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.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 D4C1EC388F2 for ; Tue, 3 Nov 2020 01:25:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 88C6A2063A for ; Tue, 3 Nov 2020 01:25:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604366728; bh=y0C3e70PNwnyKwP0EUt2SJF1JuIE0E9iWnli9MBWRKE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=D+IOdG2rDmSi8UmtTEdMivnUp4cHNCDQsIeSPxJnlJogrGompiVHaU7GQfGh8YzjM lJUpX5+OqQtpGXibpAxQIXRnuPsWl+Tnhuj1/4EiU0vJsGATG78n0k6hXdBYtHB4Cs k5ea7c1JbX07OL9aGTBMqWjiA4PmKko0kSU7aD7E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728373AbgKCBZ0 (ORCPT ); Mon, 2 Nov 2020 20:25:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:34242 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727910AbgKCBT5 (ORCPT ); Mon, 2 Nov 2020 20:19:57 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C757922447; Tue, 3 Nov 2020 01:19:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604366396; bh=y0C3e70PNwnyKwP0EUt2SJF1JuIE0E9iWnli9MBWRKE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0qujF4tr/Z16l4RN5DnyFXydnoQ5Mq89QVt0HxWoEsoUNt590w4oKs5H5WzArlM8v oJjoH1M57ybtfDyGIohYdRBsU0I0LQLjfYIyx3VhpjoaVOuSGosmq8WJGSm2DG+CE8 1wgRAJ1bIY0xMwDFuY9v30hofGv1YVTrCs2M1qLE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jeff Vander Stoep , Roman Kiryanov , James Morris , Jakub Kicinski , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.8 21/29] vsock: use ns_capable_noaudit() on socket create Date: Mon, 2 Nov 2020 20:19:20 -0500 Message-Id: <20201103011928.183145-21-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201103011928.183145-1-sashal@kernel.org> References: <20201103011928.183145-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jeff Vander Stoep [ Upstream commit af545bb5ee53f5261db631db2ac4cde54038bdaf ] During __vsock_create() CAP_NET_ADMIN is used to determine if the vsock_sock->trusted should be set to true. This value is used later for determing if a remote connection should be allowed to connect to a restricted VM. Unfortunately, if the caller doesn't have CAP_NET_ADMIN, an audit message such as an selinux denial is generated even if the caller does not want a trusted socket. Logging errors on success is confusing. To avoid this, switch the capable(CAP_NET_ADMIN) check to the noaudit version. Reported-by: Roman Kiryanov https://android-review.googlesource.com/c/device/generic/goldfish/+/1468545/ Signed-off-by: Jeff Vander Stoep Reviewed-by: James Morris Link: https://lore.kernel.org/r/20201023143757.377574-1-jeffv@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/vmw_vsock/af_vsock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 6cd0df1c5caf6..08c9a43e9049c 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -739,7 +739,7 @@ static struct sock *__vsock_create(struct net *net, vsk->buffer_min_size = psk->buffer_min_size; vsk->buffer_max_size = psk->buffer_max_size; } else { - vsk->trusted = capable(CAP_NET_ADMIN); + vsk->trusted = ns_capable_noaudit(&init_user_ns, CAP_NET_ADMIN); vsk->owner = get_current_cred(); vsk->connect_timeout = VSOCK_DEFAULT_CONNECT_TIMEOUT; vsk->buffer_size = VSOCK_DEFAULT_BUFFER_SIZE; -- 2.27.0