]> git.itanic.dy.fi Git - linux-stable/commit
ACPI: sysfs: Fix create_pnp_modalias() and create_of_modalias()
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Mon, 23 Oct 2023 18:32:54 +0000 (20:32 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 24 Oct 2023 19:31:26 +0000 (21:31 +0200)
commit48cf49d31994ff97b33c4044e618560ec84d35fb
tree96763bad39ef6079a0704c3224cd863145ae2a66
parent05d3ef8bba77c1b5f98d941d8b2d4aeab8118ef1
ACPI: sysfs: Fix create_pnp_modalias() and create_of_modalias()

snprintf() does not return negative values on error.

To know if the buffer was too small, the returned value needs to be
compared with the length of the passed buffer. If it is greater or
equal, the output has been truncated, so add checks for the truncation
to create_pnp_modalias() and create_of_modalias(). Also make them
return -ENOMEM in that case, as they already do that elsewhere.

Moreover, the remaining size of the buffer used by snprintf() needs to
be updated after the first write to avoid out-of-bounds access as
already done correctly in create_pnp_modalias(), but not in
create_of_modalias(), so change the latter accordingly.

Fixes: 8765c5ba1949 ("ACPI / scan: Rework modalias creation when "compatible" is present")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
[ rjw: Merge two patches into one, combine changelogs, add subject ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/device_sysfs.c