Commit 445c1470 authored by Ross Philipson's avatar Ross Philipson Committed by Borislav Petkov
Browse files

x86/boot: Add setup_indirect support in early_memremap_is_setup_data() 



The x86 boot documentation describes the setup_indirect structures and
how they are used. Only one of the two functions in ioremap.c that needed
to be modified to be aware of the introduction of setup_indirect
functionality was updated. Adds comparable support to the other function
where it was missing.

Fixes: b3c72fc9 ("x86/boot: Introduce setup_indirect")
Signed-off-by: default avatarRoss Philipson <ross.philipson@oracle.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarDaniel Kiper <daniel.kiper@oracle.com>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/1645668456-22036-3-git-send-email-ross.philipson@oracle.com
parent 7228918b

arch/x86/mm/ioremap.c

+31 −2
Original line number Diff line number Diff line
@@ -676,22 +676,51 @@ static bool memremap_is_setup_data(resource_size_t phys_addr, 
static bool __init early_memremap_is_setup_data(resource_size_t phys_addr,

						unsigned long size)

{

	struct setup_indirect *indirect;

	struct setup_data *data;

	u64 paddr, paddr_next;



	paddr = boot_params.hdr.setup_data;

	while (paddr) {

		unsigned int len;

		unsigned int len, size;



		if (phys_addr == paddr)

			return true;



		data = early_memremap_decrypted(paddr, sizeof(*data));

		if (!data) {

			pr_warn("failed to early memremap setup_data entry\n");

			return false;

		}



		size = sizeof(*data);



		paddr_next = data->next;

		len = data->len;



		if ((phys_addr > paddr) && (phys_addr < (paddr + len))) {

			early_memunmap(data, sizeof(*data));

			return true;

		}



		if (data->type == SETUP_INDIRECT) {

			size += len;

			early_memunmap(data, sizeof(*data));

			data = early_memremap_decrypted(paddr, size);

			if (!data) {

				pr_warn("failed to early memremap indirect setup_data\n");

				return false;

			}



			indirect = (struct setup_indirect *)data->data;



			if (indirect->type != SETUP_INDIRECT) {

				paddr = indirect->addr;

				len = indirect->len;

			}

		}



		early_memunmap(data, size);



		if ((phys_addr > paddr) && (phys_addr < (paddr + len)))

			return true;