Message ID | 20231017202505.340906-6-rick.p.edgecombe@intel.com (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E84B2C46CA1 for <linux-mm@archiver.kernel.org>; Tue, 17 Oct 2023 20:25:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8870A8006C; Tue, 17 Oct 2023 16:25:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 80FA78000C; Tue, 17 Oct 2023 16:25:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 639C98006C; Tue, 17 Oct 2023 16:25:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 4DD158006B for <linux-mm@kvack.org>; Tue, 17 Oct 2023 16:25:37 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 23B44160E7E for <linux-mm@kvack.org>; Tue, 17 Oct 2023 20:25:37 +0000 (UTC) X-FDA: 81356083914.11.E49034C Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by imf21.hostedemail.com (Postfix) with ESMTP id 1870E1C0002 for <linux-mm@kvack.org>; Tue, 17 Oct 2023 20:25:34 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="QvX/ZOIV"; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf21.hostedemail.com: domain of rick.p.edgecombe@intel.com designates 192.198.163.7 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697574335; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=vn/QWymgXbx5kwDG9AWdS1zUsVcq5hgu1sjNh/vZ5E8=; b=58Sbg5iX4pRrw9QI5rzCoxhteLsgQwtnH4O0MeUFmZYVCD5SnGd7CypCa+4WWKrz6xI30h PJrWj7EqIMCkUaNxfwn1mYeXU+kWu37NaaEUcSZfc9rT/e/ZR91PqAjT5bQvvowg9SvYRx 2WuyfjhkcnOl8BxELYh/TTO+LCS12PA= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="QvX/ZOIV"; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf21.hostedemail.com: domain of rick.p.edgecombe@intel.com designates 192.198.163.7 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697574335; a=rsa-sha256; cv=none; b=WLMTlNgOoheLNzzTK4KXF/epue2RqskRoHeAmzS/P6arP0HdZ0/gaFEgYEdCKDN2QUGqx2 ukhRVIW+U/GPWAAQFCeB2wbxel+T9YGudeHI6QyJR2lEhkGm9a2uZtnt+XJvFj9CerWdrP fBX+Qu6u/qZe14Qm01y6/Vr9g/sHvsE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697574335; x=1729110335; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=J1x07zCPUyPDNEiTVhjwVyzpDF64pQWTC5hwW7cc64I=; b=QvX/ZOIVZ2DKIEQnQq00+y+T4KQ5HyNyFm8EvWEE4BfhKFBUf9UAPXVI ZS/EqOf98QcG3d7c0xwdiY+rDFmfd5di4QP46s2F3RXBmovGG2rlrwl6C Kdkay0Xw8l3Y8DIWpagDaY3dGreF5Oup4AKEzL3uMNdMsTSaqqRLf0BCE VvRuoeL4JBjZjus90ZFDx1x1jKIEctVUOOMGZ1xK0GxEdFdgeg2MZQNE2 Ogg0ftGYD2SGUUNXjnPRuvxEMiOpUVpL53j7SWOwM7vqQGc2TOqLUuw8e W/EFVQWOpr+MtZTiP6JIwQ5j++REik+OlXoYutX3cboDOTnF/8EslN1/3 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10866"; a="7429544" X-IronPort-AV: E=Sophos;i="6.03,233,1694761200"; d="scan'208";a="7429544" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2023 13:25:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10866"; a="900040454" X-IronPort-AV: E=Sophos;i="6.03,233,1694761200"; d="scan'208";a="900040454" Received: from rtdinh-mobl1.amr.corp.intel.com (HELO rpedgeco-desk4.intel.com) ([10.212.150.155]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2023 13:23:30 -0700 From: Rick Edgecombe <rick.p.edgecombe@intel.com> To: x86@kernel.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, luto@kernel.org, peterz@infradead.org, kirill.shutemov@linux.intel.com, elena.reshetova@intel.com, isaku.yamahata@intel.com, seanjc@google.com, Michael Kelley <mikelley@microsoft.com>, thomas.lendacky@amd.com, decui@microsoft.com, sathyanarayanan.kuppuswamy@linux.intel.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: rick.p.edgecombe@intel.com, Richard Cochran <richardcochran@gmail.com>, netdev@vger.kernel.org Subject: [PATCH 05/10] ptp: Use free_decrypted_pages() Date: Tue, 17 Oct 2023 13:25:00 -0700 Message-Id: <20231017202505.340906-6-rick.p.edgecombe@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231017202505.340906-1-rick.p.edgecombe@intel.com> References: <20231017202505.340906-1-rick.p.edgecombe@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 1870E1C0002 X-Stat-Signature: meg9csp8yp6iwtj4zf1s74zfst8fcjm3 X-HE-Tag: 1697574334-356209 X-HE-Meta: U2FsdGVkX1+T1eEhB0x20Azw7ke7r77Cb8ezCGTX0hqXVTZ9S54vh4MdRIztSWjlmHxSdmdzygjV13wOXIBPPUnpvclolTqynYfkQ94eqquVp27Y5MXzIMMzxb82jXhucc2Pv7i4rrJXTxatdiICTnSX/bW4Zu/2CtMa+OcHW8jl1vx9EtqujLCKxOMcNspB+y3XyJ618pIldQarf4n7UxvuBRTiMjc47irBg8yKLI7SVK/M7DHzNsPnya4ONN27RtZtRgRtgETpOE6nPWroAVB/P+aP1A7+xSPeIEUVmpDlLxTsVtVYmnZ0t600iU62AO9rQ4fJ5A0fUEwxbA+jvK3JDiT6C3iHs7/t2Sfyn2lPWF8pjwv6UCy5+vaEOstN9fvRq3JzQZad8syGzo03lL4OWq2916zybxbA8g2VgJbEVd5sDg9e8fwngtJ3MikPT/cv5DqPDoNzTi4vciPtieKVlTBz/ObBUebB/urxeRv+Hhv4szeQfiUtVJVDeokgIkHbphXSyCaLowZr61fYQRJLH0NXcYpLbv2x4DpGpMkc3A/X5/ZHxcwXZngLZJJfCjCTy9wNicnRaA/M4Si3UuU65xwFVoP5HMEmabWrTfmwxyJpfqO6DHWtxrfKj3SaWagEhWJHUsUO58np5Mt8SXcDyQTLzkU0snLGl5zFGfP6/427yi9cJfbsKeF4SX7BFxRfkLT3RHGwlkqJ1uZFu1RlfLhXop1aBh0D4IeJhEV0Zu80kZl+mCFbSMQiZFsYGBTP84/QB5U47TwZcOpiDyfblBWcXbMKtuNVHOJ9nJP1ZoAyq07XC7TOIw0QdsL7stlCbYHUuaXeWamZ41Tm+O9CXAf+FGlilbOP3HFxpASbwVRGximQUz2w+xJR/M1n7PWiN/XHtQw/iOiZ8Bx1rMMA6JOAmOdkiUXbndfEdOYoxvTZFYh0nmgfbEQjlm0scuY3XyY9mownl6pIQ8p 7GYDKG3u SY98mfZpjkeTUDPueDB818yReZIg+dd5o7htHOe+xfFnxVKR+oP+YBMmZem4fjRq/qLOEqDKXVHzyA5sXs/rXcebjc23omCs3P97gVDQQgOA2sm65Rgik338E3m2lhtucPF6wbKHMDkLc5a1Uszp1zJ8ZpHZYOM40UanSZxv/3K4Vjj7L0NQWjBOXw14jxe3assTPkPcD8la6RPsOC+6f4DMAxmg4lkYe7XvIpCfGSCaSoeoy0seQceSo+xW/KhGsNw5pzhcyw7VzpFiTVloPVYqqluLBYcfFL0P2 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: <linux-mm.kvack.org> |
Series |
Handle set_memory_XXcrypted() errors
|
expand
|
diff --git a/drivers/ptp/ptp_kvm_x86.c b/drivers/ptp/ptp_kvm_x86.c index 902844cc1a17..203af060013d 100644 --- a/drivers/ptp/ptp_kvm_x86.c +++ b/drivers/ptp/ptp_kvm_x86.c @@ -36,7 +36,7 @@ int kvm_arch_ptp_init(void) clock_pair = page_address(p); ret = set_memory_decrypted((unsigned long)clock_pair, 1); if (ret) { - __free_page(p); + free_decrypted_pages((unsigned long)clock_pair, 0); clock_pair = NULL; goto nofree; }
On TDX 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. Ptp could free decrypted/shared pages if set_memory_decrypted() fails. Use the recently added free_decrypted_pages() to avoid this. Cc: Richard Cochran <richardcochran@gmail.com> Cc: netdev@vger.kernel.org Signed-off-by: Rick Edgecombe <rick.p.edgecombe@intel.com> --- drivers/ptp/ptp_kvm_x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)