michaelh/zephyr
1
0
Fork 0
Code Releases Activity

canbus: isotp: fix single frame state machine stuck issue

Browse source 
it is too late to set ctx->state to ISOTP_TX_WAIT_FIN after send_sf
because send_state_machine could be called just between `send_sf` and
`ctx->state = ISOTP_TX_WAIT_FIN;`  in extremely case. like below:
```c
	ret = send_sf(ctx);
	-> send_state_machine (irq handler)
	ctx->state = ISOTP_TX_WAIT_FIN;
```
it will cause isotp_send never return.

Signed-off-by: Jiapeng Li <mail@jiapeng.me>
This commit is contained in:
Jiapeng Li 2023-04-12 19:04:22 +08:00 • committed by Carles Cufí
commit 2568ab661d
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
subsys/canbus/isotp/isotp.c
View file

@ -1091,6 +1091,8 @@ static void send_state_machine(struct isotp_send_ctx *ctx)
case ISOTP_TX_ERR:
LOG_DBG("SM error");
__fallthrough;
case ISOTP_TX_SEND_SF:
__fallthrough;
case ISOTP_TX_WAIT_FIN:
if (ctx->filter_id >= 0) {
can_remove_rx_filter(ctx->can_dev, ctx->filter_id);
@ -1187,7 +1189,6 @@ static int send(struct isotp_send_ctx *ctx, const struct device *can_dev,
LOG_DBG("Sending single frame");
ctx->filter_id = -1;
ret = send_sf(ctx);
ctx->state = ISOTP_TX_WAIT_FIN;
if (ret) {
return ret == -EAGAIN ?
ISOTP_N_TIMEOUT_A : ISOTP_N_ERROR;