summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-07-30 12:32:09 -0700
committerDavid S. Miller <davem@davemloft.net>2018-07-30 12:32:09 -0700
commitaf87f72e757a656d63c8410b1b0598b67d6a9ce3 (patch)
treeeb1ae68803764f6e639f1edb637b72f47b46a07f
parentdf18b50448fab1dff093731dfd0e25e77e1afcd1 (diff)
parent72c05f32f4a5055c9c8fe889bb6903ec959c0aad (diff)
downloadlinux-af87f72e757a656d63c8410b1b0598b67d6a9ce3.tar.bz2
Merge tag 'linux-can-fixes-for-4.18-20180730' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says: ==================== pull-request: can 2018-07-30 this is a pull request of one patch for net/master. The patch by Anton Vasilyev and the Linux Driver Verification project fixes a memory leak in the ems_usb driver's disconnect function. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/can/usb/ems_usb.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index 12ff0020ecd6..b7dfd4109d24 100644
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -1072,6 +1072,7 @@ static void ems_usb_disconnect(struct usb_interface *intf)
usb_free_urb(dev->intr_urb);
kfree(dev->intr_in_buffer);
+ kfree(dev->tx_msg_buffer);
}
}