Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 316f31f1 authored by David Arcari's avatar David Arcari Committed by Greg Kroah-Hartman
Browse files

mailbox: PCC: handle parse error 



commit afd0b1fb22269f48d68fdf269891c653818c8047 upstream.

acpi_pcc_probe() calls acpi_table_parse_entries_array() but fails
to check for an error return.  This in turn can result in calling
kcalloc() with a negative count as well as emitting the following
misleading erorr message:

[    2.642015] Could not allocate space for PCC mbox channels

Fixes: 8f8027c5 (mailbox: PCC: erroneous error message when parsing ACPI PCCT)
Signed-off-by: default avatarDavid Arcari <darcari@redhat.com>
Reviewed-by: default avatarAl Stone <ahs3@redhat.com>
Cc: 4.18+ <stable@vger.kernel.org> # 4.18+
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8e071518

drivers/mailbox/pcc.c

+5 −2
Original line number Diff line number Diff line
@@ -461,7 +461,10 @@ static int __init acpi_pcc_probe(void) 
	count = acpi_table_parse_entries_array(ACPI_SIG_PCCT,

			sizeof(struct acpi_table_pcct), proc,

			ACPI_PCCT_TYPE_RESERVED, MAX_PCC_SUBSPACES);

	if (count == 0 || count > MAX_PCC_SUBSPACES) {

	if (count <= 0 || count > MAX_PCC_SUBSPACES) {

		if (count < 0)

			pr_warn("Error parsing PCC subspaces from PCCT\n");

		else

			pr_warn("Invalid PCCT: %d PCC subspaces\n", count);

		return -EINVAL;

	}