Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp483536pxj; Thu, 17 Jun 2021 07:13:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzovbF5qxJjb2qTLkUI3vKzE7rlmsWb8Fgg+QorcS+BVOQ8oXuk3QetoL6+E2iwjiPZzPoX X-Received: by 2002:a05:6402:144d:: with SMTP id d13mr6612935edx.288.1623939206518; Thu, 17 Jun 2021 07:13:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623939206; cv=none; d=google.com; s=arc-20160816; b=Wxf/oNVrhjdT2a+lCLYAjAA5FBgNHxlAzi66afTNTH2fN1TNPO3JJ81YtGCPabKND2 zKwEy5N39KYJVLe7lmfUpFP/BmKyTlAegKZscVewc6RBer6/XiyaTK7xcgd7FQXXb5Qd kF4mcSDar/n+Oj2QfEIYP2pbnG+RshqeZKxhotk6Qjq99hINorjjSlgeh4vhlkqbogvF uzF0anJe7lLoObkD7QbC35Q7nu0m/VGFG+E8ZjXPcG1xwYNdmHguKBPJJ1HMcvESK6jw 4gkRr31Ss+jJqLUWWgoWzzpoIX2Hjlnr3yTw+q6jeL0+8hqFBShqUQzsNnSVWeEjPQMR CjAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=36jlh616s4R8bTwHVuHKlXUvMsSOOkVe9eCjkYNkCwg=; b=cEeOGw1lRkt4T835lldXVjuXft9YJGpTOW9JbBYCMEPogbOczj34ywwrD/BglapDsm mQzGjO8z5OqXs+N16vMpzxvLd7q3jiJzBvMCUbHK3E5FuD5xnR9rTcRx7uyzaBtCskWv C7A5sq2Gmj+Hwd41mHFsYR9Vqp/X3cz/oGnhF9c+YTKvG+dfh8c1DtfTVWDaZENfHx2g U/8QRGKSMm4a7RlQ4yi6mtJ4kg/VMY5n7QIAzG1E03heslw6q5WVak8z6MSWr3hRiCSr QxcmOULPbVDeMyppzKrp/mwSV7JtzLHzn/YlZqNL7y5VF8SPGPoXcpzUIrY0yJaF4Sxy 3gkQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w9si5738793edx.451.2021.06.17.07.13.03; Thu, 17 Jun 2021 07:13:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232160AbhFQNIp (ORCPT + 99 others); Thu, 17 Jun 2021 09:08:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230137AbhFQNIo (ORCPT ); Thu, 17 Jun 2021 09:08:44 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4744C061574 for ; Thu, 17 Jun 2021 06:06:36 -0700 (PDT) Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ltriz-0007KN-Sv; Thu, 17 Jun 2021 15:06:25 +0200 Received: from ore by dude.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1ltriy-0003KK-8Y; Thu, 17 Jun 2021 15:06:24 +0200 From: Oleksij Rempel To: mkl@pengutronix.de, "David S. Miller" , Jakub Kicinski , Oliver Hartkopp , Robin van der Gracht Cc: Oleksij Rempel , Thadeu Lima de Souza Cascardo , syzbot+bdf710cfc41c186fdff3@syzkaller.appspotmail.com, kernel@pengutronix.de, linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1] can: j1939: j1939_sk_init(): set SOCK_RCU_FREE to call sk_destruct() after RCU is done Date: Thu, 17 Jun 2021 15:06:23 +0200 Message-Id: <20210617130623.12705-1-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: ore@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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() Reported-by: Thadeu Lima de Souza Cascardo Reported-by: syzbot+bdf710cfc41c186fdff3@syzkaller.appspotmail.com Fixes: 25fe97cb7620 ("can: j1939: move j1939_priv_put() into sk_destruct callback") Signed-off-by: Oleksij Rempel --- net/can/j1939/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/can/j1939/socket.c b/net/can/j1939/socket.c index 56aa66147d5a..c7c1b4d4c0fb 100644 --- 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); + + sock_set_flag(sk, SOCK_RCU_FREE); + /* j1939_sk_sock_destruct() depends on SOCK_RCU_FREE flag */ sk->sk_destruct = j1939_sk_sock_destruct; sk->sk_protocol = CAN_J1939; -- 2.29.2