diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-11-13 11:47:02 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-13 11:47:02 -0800 |
| commit | b3dff0eb4b98c16e7dc395326425569e226f7843 (patch) | |
| tree | 39021f7475aa67c61e2827372895404faad92560 /include/linux | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec (diff) | |
| parent | can: j1939: warn if resources are still linked on destroy (diff) | |
Merge tag 'linux-can-fixes-for-5.4-20191113' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2019-11-13
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.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/can/core.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/can/core.h b/include/linux/can/core.h index 8339071ab08b..e20a0cd09ba5 100644 --- a/include/linux/can/core.h +++ b/include/linux/can/core.h @@ -65,5 +65,6 @@ extern void can_rx_unregister(struct net *net, struct net_device *dev, void *data); extern int can_send(struct sk_buff *skb, int loop); +void can_sock_destruct(struct sock *sk); #endif /* !_CAN_CORE_H */ |