Home Home > GIT Browse > SLE15
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-06-24 12:09:04 +0200
committerTakashi Iwai <tiwai@suse.de>2019-06-24 12:09:08 +0200
commitab2392e2a9b88abbd72d29ebbc3de31e904caed9 (patch)
tree0e0cc69faf046ba2243caca496d02fcdc89167bd
parent552e279a32de025f0e1384b77e2c9ac4d2c465cb (diff)
can: purge socket error queue on sock destruct (bsc#1051510).
-rw-r--r--patches.fixes/can-purge-socket-error-queue-on-sock-destruct.patch37
-rw-r--r--series.conf1
2 files changed, 38 insertions, 0 deletions
diff --git a/patches.fixes/can-purge-socket-error-queue-on-sock-destruct.patch b/patches.fixes/can-purge-socket-error-queue-on-sock-destruct.patch
new file mode 100644
index 0000000000..224774f315
--- /dev/null
+++ b/patches.fixes/can-purge-socket-error-queue-on-sock-destruct.patch
@@ -0,0 +1,37 @@
+From fd704bd5ee749d560e86c4f1fd2ef486d8abf7cf Mon Sep 17 00:00:00 2001
+From: Willem de Bruijn <willemb@google.com>
+Date: Fri, 7 Jun 2019 16:46:07 -0400
+Subject: [PATCH] can: purge socket error queue on sock destruct
+Git-commit: fd704bd5ee749d560e86c4f1fd2ef486d8abf7cf
+Patch-mainline: v5.2-rc6
+References: bsc#1051510
+
+CAN supports software tx timestamps as of the below commit. Purge
+any queued timestamp packets on socket destroy.
+
+Fixes: 51f31cabe3ce ("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>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ net/can/af_can.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/net/can/af_can.c b/net/can/af_can.c
+index 743470680127..80281ef2ccbd 100644
+--- a/net/can/af_can.c
++++ b/net/can/af_can.c
+@@ -99,6 +99,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)
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index f6aca2c364..569257ab58 100644
--- a/series.conf
+++ b/series.conf
@@ -22612,6 +22612,7 @@
patches.fixes/0001-mwifiex-Abort-at-too-short-BSS-descriptor-element.patch
patches.fixes/0001-mwifiex-Fix-heap-overflow-in-mwifiex_uap_parse_tail_.patch
patches.fixes/can-af_can-Fix-error-path-of-can_init.patch
+ patches.fixes/can-purge-socket-error-queue-on-sock-destruct.patch
patches.fixes/cfg80211-fix-memory-leak-of-wiphy-device-name.patch
patches.drivers/qmi_wwan-add-support-for-QMAP-padding-in-the-RX-path.patch
patches.drivers/qmi_wwan-add-network-device-usage-statistics-for-qmi.patch