tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'acpi-4.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI fixes from Rafael Wysocki:
"These fix a recently introduced issue in the ACPI CPPC driver and an
obscure error hanling bug in the APEI code.

Specifics:

- Fix an error handling issue in the ACPI APEI implementation of the
>read callback in struct pstore_info (Takashi Iwai).

- Fix a possible out-of-bounds arrar read in the ACPI CPPC driver
(Colin Ian King)"

* tag 'acpi-4.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: APEI / ERST: Fix missing error handling in erst_reader()
ACPI: CPPC: remove initial assignment of pcc_ss_data

Linus Torvalds 1362d628 9cd238ab

+2 -2
+1 -1
drivers/acpi/apei/erst.c
··· 1007 1007 /* The record may be cleared by others, try read next record */ 1008 1008 if (len == -ENOENT) 1009 1009 goto skip; 1010 - else if (len < sizeof(*rcd)) { 1010 + else if (len < 0 || len < sizeof(*rcd)) { 1011 1011 rc = -EIO; 1012 1012 goto out; 1013 1013 }
+1 -1
drivers/acpi/cppc_acpi.c
··· 1171 1171 struct cpc_desc *cpc_desc = per_cpu(cpc_desc_ptr, cpu); 1172 1172 struct cpc_register_resource *desired_reg; 1173 1173 int pcc_ss_id = per_cpu(cpu_pcc_subspace_idx, cpu); 1174 - struct cppc_pcc_data *pcc_ss_data = pcc_data[pcc_ss_id]; 1174 + struct cppc_pcc_data *pcc_ss_data; 1175 1175 int ret = 0; 1176 1176 1177 1177 if (!cpc_desc || pcc_ss_id < 0) {