can: j1939: j1939_sk_init(): set SOCK_RCU_FREE to call sk_destruct() after RCU is...

BugLink: https://bugs.launchpad.net/bugs/1938199
commit 22c696fed25c63c7f67508309820358b94a96b6d upstream.

Set SOCK_RCU_FREE to let RCU to call sk_destruct() on completion.
Without this patch, we will run in to j1939_can_recv() after priv was
freed by j1939_sk_release()->j1939_sk_sock_destruct()

Fixes: 25fe97cb7620 ("can: j1939: move j1939_priv_put() into sk_destruct callback")
Link: https://lore.kernel.org/r/20210617130623.12705-1-o.rempel@pengutronix.de
Cc: linux-stable <stable@vger.kernel.org>
Reported-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Reported-by: syzbot+bdf710cfc41c186fdff3@syzkaller.appspotmail.com
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/net/can/j1939/main.c b/net/can/j1939/main.c
index f53df216d6965c7396234616a73d2fb663c1a036..7dce6e235917159b22833df8ed095f9c53282444 100644 (file)
--- a/net/can/j1939/main.c
+++ b/net/can/j1939/main.c
@@ -360,6 +360,10 @@ static int j1939_netdev_notify(struct notifier_block *nb,
                break;
        }
 
+       /* The last reference of priv is dropped by the RCU deferred
+        * j1939_sk_sock_destruct() of the last socket, so we can
+        * safely drop this reference here.
+        */
        j1939_priv_put(priv);
 
 notify_done:

diff --git a/net/can/j1939/socket.c b/net/can/j1939/socket.c
index d57475c8ba07f1d4dcd2973ca3dae100866c27f6..51bfb220fad85ccc7c87f9ec6e6ce1c79422ea1c 100644 (file)
--- a/net/can/j1939/socket.c
+++ b/net/can/j1939/socket.c
@@ -398,6 +398,9 @@ static int j1939_sk_init(struct sock *sk)
        atomic_set(&jsk->skb_pending, 0);
        spin_lock_init(&jsk->sk_session_queue_lock);
        INIT_LIST_HEAD(&jsk->sk_session_queue);
+
+       /* j1939_sk_sock_destruct() depends on SOCK_RCU_FREE flag */
+       sock_set_flag(sk, SOCK_RCU_FREE);
        sk->sk_destruct = j1939_sk_sock_destruct;
        sk->sk_protocol = CAN_J1939;