From: "tip-bot2 for Michael Kelley" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Michael Kelley <mikelley@microsoft.com>,
Borislav Petkov <bp@suse.de>,
Dave Hansen <dave.hansen@linux.intel.com>, <stable@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/urgent] x86/ioremap: Fix page aligned size calculation in __ioremap_caller()
Date: Tue, 22 Nov 2022 11:38:50 -0000 [thread overview]
Message-ID: <166911713030.4906.16935727667401525991.tip-bot2@tip-bot2> (raw)
In-Reply-To: <1668624097-14884-2-git-send-email-mikelley@microsoft.com>
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 4dbd6a3e90e03130973688fd79e19425f720d999
Gitweb: https://git.kernel.org/tip/4dbd6a3e90e03130973688fd79e19425f720d999
Author: Michael Kelley <mikelley@microsoft.com>
AuthorDate: Wed, 16 Nov 2022 10:41:24 -08:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Tue, 22 Nov 2022 12:21:16 +01:00
x86/ioremap: Fix page aligned size calculation in __ioremap_caller()
Current code re-calculates the size after aligning the starting and
ending physical addresses on a page boundary. But the re-calculation
also embeds the masking of high order bits that exceed the size of
the physical address space (via PHYSICAL_PAGE_MASK). If the masking
removes any high order bits, the size calculation results in a huge
value that is likely to immediately fail.
Fix this by re-calculating the page-aligned size first. Then mask any
high order bits using PHYSICAL_PAGE_MASK.
Fixes: ffa71f33a820 ("x86, ioremap: Fix incorrect physical address handling in PAE mode")
Signed-off-by: Michael Kelley <mikelley@microsoft.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: <stable@kernel.org>
Link: https://lore.kernel.org/r/1668624097-14884-2-git-send-email-mikelley@microsoft.com
---
arch/x86/mm/ioremap.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 78c5bc6..6453fba 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -217,9 +217,15 @@ __ioremap_caller(resource_size_t phys_addr, unsigned long size,
* Mappings have to be page-aligned
*/
offset = phys_addr & ~PAGE_MASK;
- phys_addr &= PHYSICAL_PAGE_MASK;
+ phys_addr &= PAGE_MASK;
size = PAGE_ALIGN(last_addr+1) - phys_addr;
+ /*
+ * Mask out any bits not part of the actual physical
+ * address, like memory encryption bits.
+ */
+ phys_addr &= PHYSICAL_PAGE_MASK;
+
retval = memtype_reserve(phys_addr, (u64)phys_addr + size,
pcm, &new_pcm);
if (retval) {
next prev parent reply other threads:[~2022-11-22 11:43 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-16 18:41 [Patch v3 00/14] Add PCI pass-thru support to Hyper-V Confidential VMs Michael Kelley
2022-11-16 18:41 ` [Patch v3 01/14] x86/ioremap: Fix page aligned size calculation in __ioremap_caller() Michael Kelley
2022-11-21 13:32 ` Borislav Petkov
2022-11-21 16:40 ` Michael Kelley (LINUX)
2022-11-21 19:45 ` Borislav Petkov
2022-11-21 21:02 ` Michael Kelley (LINUX)
2022-11-21 18:14 ` Dave Hansen
2022-11-21 21:04 ` Michael Kelley (LINUX)
2022-11-21 21:08 ` Borislav Petkov
2022-11-22 11:38 ` tip-bot2 for Michael Kelley [this message]
2022-11-16 18:41 ` [Patch v3 02/14] x86/ioapic: Gate decrypted mapping on cc_platform_has() attribute Michael Kelley
2022-11-17 21:39 ` Sathyanarayanan Kuppuswamy
2022-11-21 13:50 ` Borislav Petkov
2022-11-21 16:43 ` Michael Kelley (LINUX)
2022-11-21 19:47 ` Borislav Petkov
2022-11-16 18:41 ` [Patch v3 03/14] x86/hyperv: Reorder code in prep for subsequent patch Michael Kelley
2022-11-16 18:41 ` [Patch v3 04/14] Drivers: hv: Explicitly request decrypted in vmap_pfn() calls Michael Kelley
2022-11-16 18:41 ` [Patch v3 05/14] x86/mm: Handle decryption/re-encryption of bss_decrypted consistently Michael Kelley
2022-11-16 20:35 ` Tom Lendacky
2022-11-16 21:15 ` Tom Lendacky
2022-11-18 2:59 ` Michael Kelley (LINUX)
2022-11-17 21:47 ` Sathyanarayanan Kuppuswamy
2022-11-18 2:55 ` Michael Kelley (LINUX)
2022-11-21 14:39 ` Borislav Petkov
2022-11-21 22:06 ` Sathyanarayanan Kuppuswamy
2022-11-22 17:59 ` Michael Kelley (LINUX)
2022-11-28 10:50 ` Borislav Petkov
2022-11-28 2:52 ` Dexuan Cui
2022-11-28 14:15 ` Tom Lendacky
2022-11-28 18:06 ` Dexuan Cui
2022-11-21 14:40 ` Borislav Petkov
2022-11-16 18:41 ` [Patch v3 06/14] init: Call mem_encrypt_init() after Hyper-V hypercall init is done Michael Kelley
2022-11-16 21:14 ` Tom Lendacky
2022-11-21 14:46 ` Borislav Petkov
2022-11-16 18:41 ` [Patch v3 07/14] x86/hyperv: Change vTOM handling to use standard coco mechanisms Michael Kelley
2022-11-17 2:59 ` Tianyu Lan
2022-11-21 15:03 ` Borislav Petkov
2022-11-22 18:22 ` Michael Kelley (LINUX)
2022-11-22 18:30 ` Dave Hansen
2022-11-22 22:02 ` Michael Kelley (LINUX)
2022-11-22 22:18 ` Borislav Petkov
2022-11-23 0:59 ` Michael Kelley (LINUX)
2022-11-28 14:38 ` Michael Kelley (LINUX)
2022-11-28 16:33 ` Borislav Petkov
2022-11-28 16:59 ` Michael Kelley (LINUX)
2022-11-28 17:24 ` Borislav Petkov
2022-11-28 17:55 ` Michael Kelley (LINUX)
2022-11-28 19:56 ` Borislav Petkov
2022-11-29 1:15 ` Michael Kelley (LINUX)
2022-11-29 8:40 ` Borislav Petkov
2022-11-29 15:49 ` Michael Kelley (LINUX)
2022-11-29 17:47 ` Borislav Petkov
2022-11-30 16:11 ` Michael Kelley (LINUX)
2022-11-16 18:41 ` [Patch v3 08/14] swiotlb: Remove bounce buffer remapping for Hyper-V Michael Kelley
2022-11-16 18:41 ` [Patch v3 09/14] Drivers: hv: vmbus: Remove second mapping of VMBus monitor pages Michael Kelley
2022-11-16 18:41 ` [Patch v3 10/14] Drivers: hv: vmbus: Remove second way of mapping ring buffers Michael Kelley
2022-11-16 18:41 ` [Patch v3 11/14] hv_netvsc: Remove second mapping of send and recv buffers Michael Kelley
2022-11-16 18:41 ` [Patch v3 12/14] Drivers: hv: Don't remap addresses that are above shared_gpa_boundary Michael Kelley
2022-11-16 18:41 ` [Patch v3 13/14] PCI: hv: Add hypercalls to read/write MMIO space Michael Kelley
2022-11-17 15:16 ` Wei Liu
2022-11-17 16:14 ` Michael Kelley (LINUX)
2022-11-17 17:01 ` Wei Liu
2022-11-17 16:32 ` Sean Christopherson
2022-11-17 17:00 ` Wei Liu
2022-11-17 18:33 ` Haiyang Zhang
2022-11-18 2:38 ` Michael Kelley (LINUX)
2022-11-16 18:41 ` [Patch v3 14/14] PCI: hv: Enable PCI pass-thru devices in Confidential VMs Michael Kelley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=166911713030.4906.16935727667401525991.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@suse.de \
--cc=dave.hansen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mikelley@microsoft.com \
--cc=stable@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®