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 4E560157498; Mon, 22 Apr 2024 23:57:08 +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=1713830228; cv=none; b=Y/UzfLQ1zRvjyLzFD7U+U3kF8qdl5gQt91/4ugfGnT8ayBE12ElNEMNLr1z8ucLpLOL6ytzRdiXvGsS25faEpgM6XOZ+m9sFR488V/O1qPYDMALHlTRDeRBbXxWlOFQsZJL+Q3RkoffDk9ai/YJ2I6KLudKk3BKqgHWia8rJnBg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713830228; c=relaxed/simple; bh=MfFI79FceBQkgI4UAXMBbRBGaLZv1F2MGplGVU2Fm98=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LKOWvR7rTIZ3wvnek4nMs87EcwCF5dSW3o8etM1oqphcYJOGpCwO/2EQzuua6P9Of9FkSxvJIa6TrlyYd6fhQRp/td+3FO6HOwWw6rmUgfFchgH1NAS6qIrPCjKQhl/Evm3oQpe9oQ9jCgzvf2gvSxBd5A4zCbQenaA3hBCt6kI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=su/JbWaN; 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="su/JbWaN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C96E3C2BD11; Mon, 22 Apr 2024 23:57:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713830228; bh=MfFI79FceBQkgI4UAXMBbRBGaLZv1F2MGplGVU2Fm98=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=su/JbWaNRVN0+Ybe3zfaN+RzkRL0Gg0ovIFjRPj8VkEYGKbdFAztpU26C7Eq+YXgG EOCqs+sShafB96OqhuflkZ2cxXOXGTCsyxBT6WZ/HnnByKlpunfHgX5Axu3E4NrgS8 bQ9/Xg76OwQj9VJDsy+B3vCsMQFXAOawckj8adzkwoL6aADgkvilZgB0P/P1RxnhzS wpKLGwW//8FUjZfNyAEeKtZ2Y20gt4vDTsbdBbnasLKda00fnCwaV2ho2oJzJPz5LV fnGJv43Z7XT+EADA7IVULXecNzXVEHAEi8pS55lQHRHAnDzAZ0luuosGmqzVhkLdjW 7cqoQZysgd9Qw== 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, gregkh@linuxfoundation.org, linux-hyperv@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 26/29] uio_hv_generic: Don't free decrypted memory Date: Mon, 22 Apr 2024 19:17:07 -0400 Message-ID: <20240422231730.1601976-26-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-hyperv@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 3d788b2fbe6a1a1a9e3db09742b90809d51638b7 ] 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 VMBus device UIO 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-5-mhklinux@outlook.com Signed-off-by: Wei Liu Message-ID: <20240311161558.1310-5-mhklinux@outlook.com> Signed-off-by: Sasha Levin --- drivers/uio/uio_hv_generic.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/uio/uio_hv_generic.c b/drivers/uio/uio_hv_generic.c index 20d9762331bd7..6be3462b109ff 100644 --- a/drivers/uio/uio_hv_generic.c +++ b/drivers/uio/uio_hv_generic.c @@ -181,12 +181,14 @@ hv_uio_cleanup(struct hv_device *dev, struct hv_uio_private_data *pdata) { if (pdata->send_gpadl.gpadl_handle) { vmbus_teardown_gpadl(dev->channel, &pdata->send_gpadl); - vfree(pdata->send_buf); + if (!pdata->send_gpadl.decrypted) + vfree(pdata->send_buf); } if (pdata->recv_gpadl.gpadl_handle) { vmbus_teardown_gpadl(dev->channel, &pdata->recv_gpadl); - vfree(pdata->recv_buf); + if (!pdata->recv_gpadl.decrypted) + vfree(pdata->recv_buf); } } @@ -295,7 +297,8 @@ hv_uio_probe(struct hv_device *dev, ret = vmbus_establish_gpadl(channel, pdata->recv_buf, RECV_BUFFER_SIZE, &pdata->recv_gpadl); if (ret) { - vfree(pdata->recv_buf); + if (!pdata->recv_gpadl.decrypted) + vfree(pdata->recv_buf); goto fail_close; } @@ -317,7 +320,8 @@ hv_uio_probe(struct hv_device *dev, ret = vmbus_establish_gpadl(channel, pdata->send_buf, SEND_BUFFER_SIZE, &pdata->send_gpadl); if (ret) { - vfree(pdata->send_buf); + if (!pdata->send_gpadl.decrypted) + vfree(pdata->send_buf); goto fail_close; } -- 2.43.0