can: purge socket error queue on sock destruct

wdebruij · gregkh · commit a97e26569b45 · 2019-07-10T09:55:33.000+02:00
commit fd704bd upstream. CAN supports software tx timestamps as of the below commit. Purge any queued timestamp packets on socket destroy. Fixes: 51f31ca ("ip: support for TX timestamps on UDP and RAW sockets") Reported-by: syzbot+a90604060cb40f5bdd16@syzkaller.appspotmail.com Signed-off-by: Willem de Bruijn <willemb@google.com> Cc: linux-stable <stable@vger.kernel.org> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/net/can/af_can.c b/net/can/af_can.c
@@ -113,6 +113,7 @@ EXPORT_SYMBOL(can_ioctl);
 static void can_sock_destruct(struct sock *sk)
 {
 	skb_queue_purge(&sk->sk_receive_queue);
+	skb_queue_purge(&sk->sk_error_queue);
 }
 
 static const struct can_proto *can_get_proto(int protocol)

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,7 @@ EXPORT_SYMBOL(can_ioctl);`
`113`	`113`	`static void can_sock_destruct(struct sock *sk)`
`114`	`114`	`{`
`115`	`115`	`skb_queue_purge(&sk->sk_receive_queue);`
	`116`	`+ skb_queue_purge(&sk->sk_error_queue);`
`116`	`117`	`}`
`117`	`118`
`118`	`119`	`static const struct can_proto *can_get_proto(int protocol)`