From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marc Kleine-Budde Subject: pull-request: can 2019-11-13 Date: Wed, 13 Nov 2019 10:55:41 +0100 Message-ID: <20191113095550.26527-1-mkl@pengutronix.de> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: Sender: netdev-owner@vger.kernel.org To: netdev@vger.kernel.org Cc: davem@davemloft.net, linux-can@vger.kernel.org, kernel@pengutronix.de List-Id: linux-can.vger.kernel.org Hello David, this is a pull request of 9 patches for net/master, hopefully for the v5.4 release cycle. All nine patches are by Oleksij Rempel and fix locking and use-after-free bugs in the j1939 stack found by the syzkaller syzbot. regards, Marc --- The following changes since commit 5aa4277d4368c099223bbcd3a9086f3351a12ce9: dpaa2-eth: free already allocated channels on probe defer (2019-11-12 19:49:27 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git tags/linux-can-fixes-for-5.4-20191113 for you to fetch changes up to 4a15d574e68afffbe8d7265e015cda2ac2a248ec: can: j1939: warn if resources are still linked on destroy (2019-11-13 10:42:34 +0100) ---------------------------------------------------------------- linux-can-fixes-for-5.4-20191113 ---------------------------------------------------------------- Oleksij Rempel (9): can: af_can: export can_sock_destruct() can: j1939: move j1939_priv_put() into sk_destruct callback can: j1939: main: j1939_ndev_to_priv(): avoid crash if can_ml_priv is NULL can: j1939: socket: rework socket locking for j1939_sk_release() and j1939_sk_sendmsg() can: j1939: transport: make sure the aborted session will be deactivated only once can: j1939: make sure socket is held as long as session exists can: j1939: transport: j1939_cancel_active_session(): use hrtimer_try_to_cancel() instead of hrtimer_cancel() can: j1939: j1939_can_recv(): add priv refcounting can: j1939: warn if resources are still linked on destroy include/linux/can/core.h | 1 + net/can/af_can.c | 3 +- net/can/j1939/main.c | 9 +++++ net/can/j1939/socket.c | 94 +++++++++++++++++++++++++++++++++++++---------- net/can/j1939/transport.c | 36 +++++++++++++----- 5 files changed, 113 insertions(+), 30 deletions(-)