]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob - queue-4.14/can-purge-socket-error-queue-on-sock-destruct.patch
4.14-stable patches
[thirdparty/kernel/stable-queue.git] / queue-4.14 / can-purge-socket-error-queue-on-sock-destruct.patch
1 From fd704bd5ee749d560e86c4f1fd2ef486d8abf7cf Mon Sep 17 00:00:00 2001
2 From: Willem de Bruijn <willemb@google.com>
3 Date: Fri, 7 Jun 2019 16:46:07 -0400
4 Subject: can: purge socket error queue on sock destruct
5
6 From: Willem de Bruijn <willemb@google.com>
7
8 commit fd704bd5ee749d560e86c4f1fd2ef486d8abf7cf upstream.
9
10 CAN supports software tx timestamps as of the below commit. Purge
11 any queued timestamp packets on socket destroy.
12
13 Fixes: 51f31cabe3ce ("ip: support for TX timestamps on UDP and RAW sockets")
14 Reported-by: syzbot+a90604060cb40f5bdd16@syzkaller.appspotmail.com
15 Signed-off-by: Willem de Bruijn <willemb@google.com>
16 Cc: linux-stable <stable@vger.kernel.org>
17 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
18 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
19
20 ---
21 net/can/af_can.c | 1 +
22 1 file changed, 1 insertion(+)
23
24 --- a/net/can/af_can.c
25 +++ b/net/can/af_can.c
26 @@ -105,6 +105,7 @@ EXPORT_SYMBOL(can_ioctl);
27 static void can_sock_destruct(struct sock *sk)
28 {
29 skb_queue_purge(&sk->sk_receive_queue);
30 + skb_queue_purge(&sk->sk_error_queue);
31 }
32
33 static const struct can_proto *can_get_proto(int protocol)