pull-request: can 2018-07-30

pull-request: can 2018-07-30

[Marc Kleine-Budde]

Hello David,

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.

regards,
Marc

[PATCH] can: ems_usb: Fix memory leak on ems_usb_disconnect()

[Marc Kleine-Budde]

From: Anton Vasilyev <vasilyev@ispras.ru>

ems_usb_probe() allocates memory for dev->tx_msg_buffer, but there
is no its deallocation in ems_usb_disconnect().

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Anton Vasilyev <vasilyev@ispras.ru>
Cc: <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/usb/ems_usb.c | 1 +
 1 file changed, 1 insertion(+)

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);
 	}
 }
 
-- 
2.18.0

Re: pull-request: can 2018-07-30

[David Miller]

From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Mon, 30 Jul 2018 11:08:21 +0200

> Hello David,
> 
> 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.

Where is the GIT URL you want me to pull from? :)

Re: pull-request: can 2018-07-30

[Marc Kleine-Budde]

[-- Attachment #1.1: Type: text/plain, Size: 1604 bytes --]

On 07/30/2018 06:16 PM, David Miller wrote:
> From: Marc Kleine-Budde <mkl@pengutronix.de>
> Date: Mon, 30 Jul 2018 11:08:21 +0200
> 
>> Hello David,
>>
>> 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.
> 
> Where is the GIT URL you want me to pull from? :)

Oops, it's definitely too hot in the office at the moment. here it it:

---

The following changes since commit 25432eba9cd8f2ef5afef55be811b010a004b5fa:

  openvswitch: meter: Fix setting meter id for new entries (2018-07-29 13:20:54 -0700)

are available in the Git repository at:

  ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git tags/linux-can-fixes-for-4.18-20180730

for you to fetch changes up to 72c05f32f4a5055c9c8fe889bb6903ec959c0aad:

  can: ems_usb: Fix memory leak on ems_usb_disconnect() (2018-07-30 11:04:27 +0200)

----------------------------------------------------------------
linux-can-fixes-for-4.18-20180730

----------------------------------------------------------------
Anton Vasilyev (1):
      can: ems_usb: Fix memory leak on ems_usb_disconnect()

 drivers/net/can/usb/ems_usb.c | 1 +
 1 file changed, 1 insertion(+)

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: pull-request: can 2018-07-30,Re: pull-request: can 2018-07-30

[David Miller]

From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Mon, 30 Jul 2018 21:06:27 +0200

> Oops, it's definitely too hot in the office at the moment. here it it:

That works, pulled, thanks :)