Commit ee7b8465 authored by Pavel Skripkin's avatar Pavel Skripkin Committed by Liu Jian
Browse files

net: caif: fix memory leak in cfusbl_device_notify 

stable inclusion
from stable-v4.19.194
commit 9ea0ab48e755d8f29fe89eb235fb86176fdb597f
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I990B2
CVE: CVE-2021-47121

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=9ea0ab48e755d8f29fe89eb235fb86176fdb597f



---------------------------

commit 7f5d8666 upstream.

In case of caif_enroll_dev() fail, allocated
link_support won't be assigned to the corresponding
structure. So simply free allocated pointer in case
of error.

Fixes: 7ad65bf6 ("caif: Add support for CAIF over CDC NCM USB interface")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarPavel Skripkin <paskripkin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarLiu Jian <liujian56@huawei.com>
parent d22a0056

net/caif/caif_usb.c

+13 −1
Original line number Diff line number Diff line
@@ -116,6 +116,11 @@ static struct cflayer *cfusbl_create(int phyid, u8 ethaddr[ETH_ALEN], 
	return (struct cflayer *) this;

}



static void cfusbl_release(struct cflayer *layer)

{

	kfree(layer);

}



static struct packet_type caif_usb_type __read_mostly = {

	.type = cpu_to_be16(ETH_P_802_EX1),

};
@@ -128,6 +133,7 @@ static int cfusbl_device_notify(struct notifier_block *me, unsigned long what, 
	struct cflayer *layer, *link_support;

	struct usbnet *usbnet;

	struct usb_device *usbdev;

	int res;



	/* Check whether we have a NCM device, and find its VID/PID. */

	if (!(dev->dev.parent && dev->dev.parent->driver &&
@@ -170,8 +176,11 @@ static int cfusbl_device_notify(struct notifier_block *me, unsigned long what, 
	if (dev->num_tx_queues > 1)

		pr_warn("USB device uses more than one tx queue\n");



	caif_enroll_dev(dev, &common, link_support, CFUSB_MAX_HEADLEN,

	res = caif_enroll_dev(dev, &common, link_support, CFUSB_MAX_HEADLEN,

			&layer, &caif_usb_type.func);

	if (res)

		goto err;



	if (!pack_added)

		dev_add_pack(&caif_usb_type);

	pack_added = true;
@@ -179,6 +188,9 @@ static int cfusbl_device_notify(struct notifier_block *me, unsigned long what, 
	strlcpy(layer->name, dev->name, sizeof(layer->name));



	return 0;

err:

	cfusbl_release(link_support);

	return res;

}



static struct notifier_block caif_device_notifier = {