From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7606716F265; Mon, 22 Apr 2024 23:57:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713830226; cv=none; b=DjnwTkmzGxbdy/ZPpdUZYp9hADgMFyo1qm9TjC5xXnTdbP8W5zJGymKjgDAakjnyvD0SPzZGpzCBkGtNOACkjs2x4G5jHNMjc/n1K639ANInCyacLiAn2afrBQngee77UutZlM4f8gfTB7v7vScrqSsA9CrWjdd/B8ysuXtOVJc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713830226; c=relaxed/simple; bh=hbF//MQ3NjhgP0EtEYpKMD7hF56CxP2QRjffX7aq5Ws=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tKmIigKfvNOzeyAw+zxMS6UcIBKbEFaGtnrfZjbgsT9rxW0mMnJw/0TBQDc14uUOSEdWrZHq2iIDnXVWTiTOkh8bawjhEte+FqHoOsVyH/vBsZjqDgXcxdapXSw5eHz6TonB8vqly9YyHnp417+n627kOWCqutsE4IG4GMBTbis= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KfI2qZAx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KfI2qZAx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 99408C32782; Mon, 22 Apr 2024 23:57:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713830226; bh=hbF//MQ3NjhgP0EtEYpKMD7hF56CxP2QRjffX7aq5Ws=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KfI2qZAxay+GXMZNxPTHTDX0rCf68hl+FwKYv04csxdeha1MazNOKENAH5YLx38tG tUQ8gOCZIzN8RaCQhAy54/mQ+Gj8PmXz51q84UUJ1HatQhWHd5VYX2R40yoJEptNML 3aSohMv9cEhJxsJGZshad/hLJPp+w8mezxZInB47aE0YuuDZQEYW6EaSVWji1OvlSn XSLUs5X5B5cdK6vsXVwz3IhwO3qPEW/LRtS4L9wHydrXZD8kra1QBK4Qbt0WDrZuRN JJXOorGvykRl/bVyjUk6+PXI5S3XLHPsiUNt0cA0yR7X72/o/21XSar6nfv6bQeYAR XacNDyYEd7UqQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Rick Edgecombe , Michael Kelley , Kuppuswamy Sathyanarayanan , "Kirill A . Shutemov" , Wei Liu , Sasha Levin , kys@microsoft.com, haiyangz@microsoft.com, decui@microsoft.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linux-hyperv@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 25/29] hv_netvsc: Don't free decrypted memory Date: Mon, 22 Apr 2024 19:17:06 -0400 Message-ID: <20240422231730.1601976-25-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240422231730.1601976-1-sashal@kernel.org> References: <20240422231730.1601976-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.28 Content-Transfer-Encoding: 8bit From: Rick Edgecombe [ Upstream commit bbf9ac34677b57506a13682b31a2a718934c0e31 ] In CoCo VMs it is possible for the untrusted host to cause set_memory_encrypted() or set_memory_decrypted() to fail such that an error is returned and the resulting memory is shared. Callers need to take care to handle these errors to avoid returning decrypted (shared) memory to the page allocator, which could lead to functional or security issues. The netvsc driver could free decrypted/shared pages if set_memory_decrypted() fails. Check the decrypted field in the gpadl to decide whether to free the memory. Signed-off-by: Rick Edgecombe Signed-off-by: Michael Kelley Reviewed-by: Kuppuswamy Sathyanarayanan Acked-by: Kirill A. Shutemov Link: https://lore.kernel.org/r/20240311161558.1310-4-mhklinux@outlook.com Signed-off-by: Wei Liu Message-ID: <20240311161558.1310-4-mhklinux@outlook.com> Signed-off-by: Sasha Levin --- drivers/net/hyperv/netvsc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index 4f9658a741024..b2f27e505f76c 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -154,8 +154,11 @@ static void free_netvsc_device(struct rcu_head *head) int i; kfree(nvdev->extension); - vfree(nvdev->recv_buf); - vfree(nvdev->send_buf); + + if (!nvdev->recv_buf_gpadl_handle.decrypted) + vfree(nvdev->recv_buf); + if (!nvdev->send_buf_gpadl_handle.decrypted) + vfree(nvdev->send_buf); bitmap_free(nvdev->send_section_map); for (i = 0; i < VRSS_CHANNEL_MAX; i++) { -- 2.43.0