ACPI fixes for 6.16-rc1

- 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).
 -----BEGIN PGP SIGNATURE-----
 
 iQFGBAABCAAwFiEEcM8Aw/RY0dgsiRUR7l+9nS/U47UFAmg588ESHHJqd0Byand5
 c29ja2kubmV0AAoJEO5fvZ0v1OO1GcEH/icD26Lx5BJGrA2ulYpESAMJRyxyDQ8Q
 zsNpFr7dLQGG8C+XfIp77ktQobUpHadUVV5zNOPwHSdRICNoqKk+aiPzAy4keNVx
 XgiyNq5lAw1LOSo/9IrCdNzOvcGzRTya2oABE6XXjMakomVJ7urZIKrRVvrgANjh
 62bx0SwbosAdHLYpoVPZlefEM+itYQeloREMvgkxIPNTx+YzNtUFA2FAvdrQ4VdA
 YCFtMkOP/SwnwKp0laHGqTfPIuaro/WQA2sXfi91zFk2PWVN/mc5qrcy3mOvZ9mD
 Y8GjA3TL/9Th/qcCWWRk/ByIGzxSkqow1CL1IWrQK6J3pl5KwcTZJxY=
 =xsjw
 -----END PGP SIGNATURE-----

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()
This commit is contained in:
Linus Torvalds 2025-05-30 12:11:46 -07:00
commit 1fbbb62945
3 changed files with 5 additions and 3 deletions

View File

@ -157,8 +157,10 @@ static __init int add_boot_memory_ranges(void)
for (int i = 0; i < mrrm_mem_entry_num; i++) {
name = kasprintf(GFP_KERNEL, "range%d", i);
if (!name)
if (!name) {
ret = -ENOMEM;
break;
}
kobj = kobject_create_and_add(name, pkobj);

View File

@ -168,7 +168,7 @@ void acpi_ut_safe_strncpy(char *dest, char *source, acpi_size dest_size)
{
/* Always terminate destination string */
memcpy(dest, source, dest_size);
strncpy(dest, source, dest_size);
dest[dest_size - 1] = 0;
}

View File

@ -766,7 +766,7 @@ static int __init einj_probe(struct faux_device *fdev)
rc = einj_get_available_error_type(&available_error_type);
if (rc)
return rc;
goto err_put_table;
rc = -ENOMEM;
einj_debug_dir = debugfs_create_dir("einj", apei_get_debugfs_dir());