summaryrefslogtreecommitdiffstats
path: root/net/ipv4/xfrm4_output.c
diff options
context:
space:
mode:
authorOliver Hartkopp <socketcan@hartkopp.net>2023-01-04 15:57:01 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-02-09 11:28:15 +0100
commitcae4c9bc35f72af5d4a079bb9d9fd62c4088a411 (patch)
tree6c8d3c7b96aa4468aaee4ff771aa605a5e8a5978 /net/ipv4/xfrm4_output.c
parent6e62048f527dcd80bf13ccf3b5a382d7da2c0889 (diff)
downloadlinux-stable-cae4c9bc35f72af5d4a079bb9d9fd62c4088a411.tar.gz
linux-stable-cae4c9bc35f72af5d4a079bb9d9fd62c4088a411.tar.bz2
linux-stable-cae4c9bc35f72af5d4a079bb9d9fd62c4088a411.zip
can: isotp: split tx timer into transmission and timeout
commit 4f027cba8216f42a18b544842efab134f8b1f9f4 upstream. The timer for the transmission of isotp PDUs formerly had two functions: 1. send two consecutive frames with a given time gap 2. monitor the timeouts for flow control frames and the echo frames This led to larger txstate checks and potentially to a problem discovered by syzbot which enabled the panic_on_warn feature while testing. The former 'txtimer' function is split into 'txfrtimer' and 'txtimer' to handle the two above functionalities with separate timer callbacks. The two simplified timers now run in one-shot mode and make the state transitions (especially with isotp_rcv_echo) better understandable. Fixes: 866337865f37 ("can: isotp: fix tx state handling for echo tx processing") Reported-by: syzbot+5aed6c3aaba661f5b917@syzkaller.appspotmail.com Cc: stable@vger.kernel.org # >= v6.0 Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net> Link: https://lore.kernel.org/all/20230104145701.2422-1-socketcan@hartkopp.net Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv4/xfrm4_output.c')
0 files changed, 0 insertions, 0 deletions