]> git.ipfire.org Git - thirdparty/linux.git/commit
can: isotp: fix tx.buf use-after-free in isotp_sendmsg()
authorOliver Hartkopp <socketcan@hartkopp.net>
Thu, 19 Mar 2026 15:47:45 +0000 (16:47 +0100)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Thu, 19 Mar 2026 16:16:02 +0000 (17:16 +0100)
commit424e95d62110cdbc8fd12b40918f37e408e35a92
treebb10ebe9c2f5ec63fb035a3a216e14ab6957087b
parentb9c310d72783cc2f30d103eed83920a5a29c671a
can: isotp: fix tx.buf use-after-free in isotp_sendmsg()

isotp_sendmsg() uses only cmpxchg() on so->tx.state to serialize access
to so->tx.buf. isotp_release() waits for ISOTP_IDLE via
wait_event_interruptible() and then calls kfree(so->tx.buf).

If a signal interrupts the wait_event_interruptible() inside close()
while tx.state is ISOTP_SENDING, the loop exits early and release
proceeds to force ISOTP_SHUTDOWN and continues to kfree(so->tx.buf)
while sendmsg may still be reading so->tx.buf for the final CAN frame
in isotp_fill_dataframe().

The so->tx.buf can be allocated once when the standard tx.buf length needs
to be extended. Move the kfree() of this potentially extended tx.buf to
sk_destruct time when either isotp_sendmsg() and isotp_release() are done.

Fixes: 96d1c81e6a04 ("can: isotp: add module parameter for maximum pdu size")
Cc: stable@vger.kernel.org
Reported-by: Ali Norouzi <ali.norouzi@keysight.com>
Co-developed-by: Ali Norouzi <ali.norouzi@keysight.com>
Signed-off-by: Ali Norouzi <ali.norouzi@keysight.com>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Link: https://patch.msgid.link/20260319-fix-can-gw-and-can-isotp-v2-2-c45d52c6d2d8@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
net/can/isotp.c