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-6.16-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI fixes from Rafael Wysocki:
"These address issues introduced by recent ACPI changes merged
previously:

- Unbreak acpi_ut_safe_strncpy() by restoring its previous behavior
changed incorrectly by a recent update (Ahmed Salem)

- Make a new static checker warning in the recently introduced ACPI
MRRM table parser go away (Dan Carpenter)

- Fix ACPI table referece leak in error path of einj_probe() (Dan
Carpenter)"

* tag 'acpi-6.16-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPICA: Switch back to using strncpy() in acpi_ut_safe_strncpy()
ACPI: MRRM: Silence error code static checker warning
ACPI: APEI: EINJ: Clean up on error in einj_probe()

Linus Torvalds 1fbbb629 976aa630

+5 -3
+3 -1
drivers/acpi/acpi_mrrm.c
··· 157 157 158 158 for (int i = 0; i < mrrm_mem_entry_num; i++) { 159 159 name = kasprintf(GFP_KERNEL, "range%d", i); 160 - if (!name) 160 + if (!name) { 161 + ret = -ENOMEM; 161 162 break; 163 + } 162 164 163 165 kobj = kobject_create_and_add(name, pkobj); 164 166
+1 -1
drivers/acpi/acpica/utnonansi.c
··· 168 168 { 169 169 /* Always terminate destination string */ 170 170 171 - memcpy(dest, source, dest_size); 171 + strncpy(dest, source, dest_size); 172 172 dest[dest_size - 1] = 0; 173 173 } 174 174
+1 -1
drivers/acpi/apei/einj-core.c
··· 766 766 767 767 rc = einj_get_available_error_type(&available_error_type); 768 768 if (rc) 769 - return rc; 769 + goto err_put_table; 770 770 771 771 rc = -ENOMEM; 772 772 einj_debug_dir = debugfs_create_dir("einj", apei_get_debugfs_dir());