Skip to content

Commit b43e3a8

Browse files
oleremmarckleinebudde
authored andcommitted
can: j1939: transport: j1939_simple_recv(): ignore local J1939 messages send not by J1939 stack
In current J1939 stack implementation, we process all locally send messages as own messages. Even if it was send by CAN_RAW socket. To reproduce it use following commands: testj1939 -P -r can0:0x80 & cansend can0 18238040#0123 This step will trigger false positive not critical warning: j1939_simple_recv: Received already invalidated message With this patch we add additional check to make sure, related skb is own echo message. Fixes: 9d71dd0 ("can: add support of SAE J1939 protocol") Signed-off-by: Oleksij Rempel <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Marc Kleine-Budde <[email protected]>
1 parent 38ba8b9 commit b43e3a8

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

net/can/j1939/socket.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,7 @@ static int j1939_sk_init(struct sock *sk)
398398
spin_lock_init(&jsk->sk_session_queue_lock);
399399
INIT_LIST_HEAD(&jsk->sk_session_queue);
400400
sk->sk_destruct = j1939_sk_sock_destruct;
401+
sk->sk_protocol = CAN_J1939;
401402

402403
return 0;
403404
}

net/can/j1939/transport.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2017,6 +2017,10 @@ void j1939_simple_recv(struct j1939_priv *priv, struct sk_buff *skb)
20172017
if (!skb->sk)
20182018
return;
20192019

2020+
if (skb->sk->sk_family != AF_CAN ||
2021+
skb->sk->sk_protocol != CAN_J1939)
2022+
return;
2023+
20202024
j1939_session_list_lock(priv);
20212025
session = j1939_session_get_simple(priv, skb);
20222026
j1939_session_list_unlock(priv);

0 commit comments

Comments
 (0)