Skip to content

Commit 1fbbb62

Browse files
committed
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()
2 parents 976aa63 + f4c606d commit 1fbbb62

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

drivers/acpi/acpi_mrrm.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,10 @@ static __init int add_boot_memory_ranges(void)
157157

158158
for (int i = 0; i < mrrm_mem_entry_num; i++) {
159159
name = kasprintf(GFP_KERNEL, "range%d", i);
160-
if (!name)
160+
if (!name) {
161+
ret = -ENOMEM;
161162
break;
163+
}
162164

163165
kobj = kobject_create_and_add(name, pkobj);
164166

drivers/acpi/acpica/utnonansi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ void acpi_ut_safe_strncpy(char *dest, char *source, acpi_size dest_size)
168168
{
169169
/* Always terminate destination string */
170170

171-
memcpy(dest, source, dest_size);
171+
strncpy(dest, source, dest_size);
172172
dest[dest_size - 1] = 0;
173173
}
174174

drivers/acpi/apei/einj-core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,7 @@ static int __init einj_probe(struct faux_device *fdev)
766766

767767
rc = einj_get_available_error_type(&available_error_type);
768768
if (rc)
769-
return rc;
769+
goto err_put_table;
770770

771771
rc = -ENOMEM;
772772
einj_debug_dir = debugfs_create_dir("einj", apei_get_debugfs_dir());

0 commit comments

Comments
 (0)