From f8d3ef32b3be5f2bc10e6ca758ca7f063bd5c4ca Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 16 Jun 2020 14:12:31 +0200 Subject: [PATCH] 4.4-stable patches added patches: can-kvaser_usb-kvaser_usb_leaf-fix-some-info-leaks-to-usb-devices.patch --- ...f-fix-some-info-leaks-to-usb-devices.patch | 54 +++++++++++++++++++ queue-4.4/series | 1 + 2 files changed, 55 insertions(+) create mode 100644 queue-4.4/can-kvaser_usb-kvaser_usb_leaf-fix-some-info-leaks-to-usb-devices.patch diff --git a/queue-4.4/can-kvaser_usb-kvaser_usb_leaf-fix-some-info-leaks-to-usb-devices.patch b/queue-4.4/can-kvaser_usb-kvaser_usb_leaf-fix-some-info-leaks-to-usb-devices.patch new file mode 100644 index 00000000000..bdd7095c869 --- /dev/null +++ b/queue-4.4/can-kvaser_usb-kvaser_usb_leaf-fix-some-info-leaks-to-usb-devices.patch @@ -0,0 +1,54 @@ +From da2311a6385c3b499da2ed5d9be59ce331fa93e9 Mon Sep 17 00:00:00 2001 +From: Xiaolong Huang +Date: Sat, 7 Dec 2019 22:40:24 +0800 +Subject: can: kvaser_usb: kvaser_usb_leaf: Fix some info-leaks to USB devices + +From: Xiaolong Huang + +commit da2311a6385c3b499da2ed5d9be59ce331fa93e9 upstream. + +Uninitialized Kernel memory can leak to USB devices. + +Fix this by using kzalloc() instead of kmalloc(). + +Signed-off-by: Xiaolong Huang +Fixes: 7259124eac7d ("can: kvaser_usb: Split driver into kvaser_usb_core.c and kvaser_usb_leaf.c") +Cc: linux-stable # >= v4.19 +Signed-off-by: Marc Kleine-Budde +[bwh: Backported to 4.9: adjust filename, context] +Signed-off-by: Ben Hutchings +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/can/usb/kvaser_usb.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/net/can/usb/kvaser_usb.c ++++ b/drivers/net/can/usb/kvaser_usb.c +@@ -787,7 +787,7 @@ static int kvaser_usb_simple_msg_async(s + return -ENOMEM; + } + +- buf = kmalloc(sizeof(struct kvaser_msg), GFP_ATOMIC); ++ buf = kzalloc(sizeof(struct kvaser_msg), GFP_ATOMIC); + if (!buf) { + usb_free_urb(urb); + return -ENOMEM; +@@ -1457,7 +1457,7 @@ static int kvaser_usb_set_opt_mode(const + struct kvaser_msg *msg; + int rc; + +- msg = kmalloc(sizeof(*msg), GFP_KERNEL); ++ msg = kzalloc(sizeof(*msg), GFP_KERNEL); + if (!msg) + return -ENOMEM; + +@@ -1590,7 +1590,7 @@ static int kvaser_usb_flush_queue(struct + struct kvaser_msg *msg; + int rc; + +- msg = kmalloc(sizeof(*msg), GFP_KERNEL); ++ msg = kzalloc(sizeof(*msg), GFP_KERNEL); + if (!msg) + return -ENOMEM; + diff --git a/queue-4.4/series b/queue-4.4/series index 9348abf0168..ccd1c66f112 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -42,3 +42,4 @@ ath9k-fix-general-protection-fault-in-ath9k_hif_usb_rx_cb.patch smack-slab-out-of-bounds-in-vsscanf.patch mm-slub-fix-a-memory-leak-in-sysfs_slab_add.patch fat-don-t-allow-to-mount-if-the-fat-length-0.patch +can-kvaser_usb-kvaser_usb_leaf-fix-some-info-leaks-to-usb-devices.patch -- 2.47.2