ACPI: IPMI: Fix message kref handling on dead device
PATCH 1/1 ACPI: IPMI: Fix message kref handling on dead device
acpi_ipmi_space_handler() takes an extra reference on tx_msg before checking whether the selected IPMI device is dead. The reference belongs to the tx_msg_list entry and is normally dropped by ipmi_cancel_tx_msg() or ipmi_flush_tx_msg() after the message is removed from the list.
On the dead-device path, the message has not been queued yet, but the error path still calls ipmi_msg_release() directly. That bypasses kref_put() and frees tx_msg while the queued-message reference is still recorded in the kref count.
Take the queued-message reference only after the dead-device check succeeds, immediately before adding tx_msg to the list.
--- drivers/acpi/acpi_ipmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/acpi_ipmi.c +1 -1
@@ -550,7 +550,6 @@ acpi_ipmi_space_handler(u32 function, acpi_physical_address address,return AE_TYPE ; } -acpi_ipmi_msg_get (tx_msg);mutex_lock (&driver_data.ipmi_lock);/* Do not add a tx_msg that can not be flushed. */ if (ipmi_device->dead) {
@@ -558,6 +557,7 @@ acpi_ipmi_space_handler(u32 function, acpi_physical_address address,ipmi_msg_release (tx_msg);return AE_NOT_EXIST ; } +acpi_ipmi_msg_get (tx_msg);spin_lock_irqsave (&ipmi_device->tx_msg_lock, flags);list_add_tail (&tx_msg->head, &ipmi_device->tx_msg_list);spin_unlock_irqrestore (&ipmi_device->tx_msg_lock, flags);
Signature · 1 line
2.43.0
Quoted 34 lines · Yuho Choi
acpi_ipmi_space_handler()takes an extra reference ontx_msgbefore checking whether the selected IPMI device is dead. The reference belongs to thetx_msg_listentry and is normally dropped byipmi_cancel_tx_msg()oripmi_flush_tx_msg()after the message is removed from the list.On the dead-device path, the message has not been queued yet, but the error path still calls
ipmi_msg_release()directly. That bypasseskref_put()and freestx_msgwhile the queued-message reference is still recorded in the kref count.Take the queued-message reference only after the dead-device check succeeds, immediately before adding
tx_msgto the list.Fixes 7b9844772237 ("ACPI / IPMI: Add reference counting for ACPI IPMI transfers")Signed-off-by Yuho Choi <[email protected]>--- drivers/acpi/acpi_ipmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/acpi/acpi_ipmi.c +0
-1@@ -550,7 +550,6 @@ acpi_ipmi_space_handler(u32 function, acpi_physical_address address,return AE_TYPE ; } -acpi_ipmi_msg_get (tx_msg);mutex_lock (&driver_data.ipmi_lock);/* Do not add a tx_msg that can not be flushed. */ if (ipmi_device->dead) {
drivers/acpi/acpi_ipmi.c acpi_ipmi_space_handler(u32 function, acpi_physical_address address,
Quoted 8 lines
drivers/acpi/acpi_ipmi.c +1
-1@@ -558,6 +557,7 @@ acpi_ipmi_space_handler(u32 function, acpi_physical_address address,ipmi_msg_release (tx_msg);return AE_NOT_EXIST ; } +acpi_ipmi_msg_get (tx_msg);spin_lock_irqsave (&ipmi_device->tx_msg_lock, flags);list_add_tail (&tx_msg->head, &ipmi_device->tx_msg_list);spin_unlock_irqrestore (&ipmi_device->tx_msg_lock, flags); --
Applied as 7.2 material, thanks!