Commit c37a3c94 authored Mar 29, 2018 by Dan Carpenter Committed by Boris Ostrovsky Mar 30, 2018

xen/acpi: off by one in read_acpi_id()

If acpi_id is == nr_acpi_bits, then we access one element beyond the end
of the acpi_psd[] array or we set one bit beyond the end of the bit map
when we do __set_bit(acpi_id, acpi_id_present);

Fixes: 59a56802 ("xen/acpi-processor: C and P-state driver that uploads said data to hypervisor.")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Joao Martins <joao.m.martins@oracle.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>

parent 4d0f1ce6

drivers/xen/xen-acpi-processor.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -364,9 +364,9 @@ read_acpi_id(acpi_handle handle, u32 lvl, void context, void *rv)
		}
		/* There are more ACPI Processor objects than in x2APIC or MADT.
		* This can happen with incorrect ACPI SSDT declerations. */
		if (acpi_id > nr_acpi_bits) {
		pr_debug("We only have %u, trying to set %u\n",
		nr_acpi_bits, acpi_id);
		if (acpi_id >= nr_acpi_bits) {
		pr_debug("max acpi id %u, trying to set %u\n",
		nr_acpi_bits - 1, acpi_id);
		return AE_OK;
		}
		/* OK, There is a ACPI Processor object */