]> git.baikalelectronics.ru Git - kernel.git/commit
x86/ioremap: Fix page aligned size calculation in __ioremap_caller()
authorMichael Kelley <mikelley@microsoft.com>
Wed, 16 Nov 2022 18:41:24 +0000 (10:41 -0800)
committerBorislav Petkov <bp@suse.de>
Tue, 22 Nov 2022 11:21:16 +0000 (12:21 +0100)
commit4dbd6a3e90e03130973688fd79e19425f720d999
tree8b729bacbb98600b4113065a29c37feeaf49800e
parent50bcceb7724e471d9b591803889df45dcbb584bc
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