From: Greg Kroah-Hartman Date: Sun, 3 Apr 2022 13:49:42 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v5.17.2~104 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=adfd74bb7040af8c2f291549276b6e3902f9a4eb;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: acpi-cppc-avoid-out-of-bounds-access-when-parsing-_cpc-data.patch --- diff --git a/queue-5.4/acpi-cppc-avoid-out-of-bounds-access-when-parsing-_cpc-data.patch b/queue-5.4/acpi-cppc-avoid-out-of-bounds-access-when-parsing-_cpc-data.patch new file mode 100644 index 00000000000..234497ade36 --- /dev/null +++ b/queue-5.4/acpi-cppc-avoid-out-of-bounds-access-when-parsing-_cpc-data.patch @@ -0,0 +1,37 @@ +From 40d8abf364bcab23bc715a9221a3c8623956257b Mon Sep 17 00:00:00 2001 +From: "Rafael J. Wysocki" +Date: Tue, 22 Mar 2022 17:02:05 +0100 +Subject: ACPI: CPPC: Avoid out of bounds access when parsing _CPC data + +From: Rafael J. Wysocki + +commit 40d8abf364bcab23bc715a9221a3c8623956257b upstream. + +If the NumEntries field in the _CPC return package is less than 2, do +not attempt to access the "Revision" element of that package, because +it may not be present then. + +Fixes: 337aadff8e45 ("ACPI: Introduce CPU performance controls using CPPC") +BugLink: https://lore.kernel.org/lkml/20220322143534.GC32582@xsang-OptiPlex-9020/ +Reported-by: kernel test robot +Signed-off-by: Rafael J. Wysocki +Reviewed-by: Huang Rui +Signed-off-by: Greg Kroah-Hartman +--- + drivers/acpi/cppc_acpi.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/acpi/cppc_acpi.c ++++ b/drivers/acpi/cppc_acpi.c +@@ -738,6 +738,11 @@ int acpi_cppc_processor_probe(struct acp + cpc_obj = &out_obj->package.elements[0]; + if (cpc_obj->type == ACPI_TYPE_INTEGER) { + num_ent = cpc_obj->integer.value; ++ if (num_ent <= 1) { ++ pr_debug("Unexpected _CPC NumEntries value (%d) for CPU:%d\n", ++ num_ent, pr->id); ++ goto out_free; ++ } + } else { + pr_debug("Unexpected entry type(%d) for NumEntries\n", + cpc_obj->type); diff --git a/queue-5.4/series b/queue-5.4/series index b8438ebd2f6..331a016200c 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -350,3 +350,4 @@ pinctrl-nuvoton-npcm7xx-use-zu-printk-format-for-array_size.patch asoc-mediatek-mt6358-add-missing-export_symbols.patch ubi-fix-race-condition-between-ctrl_cdev_ioctl-and-ubi_cdev_ioctl.patch arm-iop32x-offset-irq-numbers-by-1.patch +acpi-cppc-avoid-out-of-bounds-access-when-parsing-_cpc-data.patch