mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
net: caif: fix memory leak in cfusbl_device_notify
commit7f5d86669f
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:7ad65bf68d
("caif: Add support for CAIF over CDC NCM USB interface") Cc: stable@vger.kernel.org Signed-off-by: Pavel Skripkin <paskripkin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
f52f4fd672
commit
4d94f530cd
1 changed files with 13 additions and 1 deletions
|
@ -115,6 +115,11 @@ static struct cflayer *cfusbl_create(int phyid, u8 ethaddr[ETH_ALEN],
|
||||||
return (struct cflayer *) this;
|
return (struct cflayer *) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void cfusbl_release(struct cflayer *layer)
|
||||||
|
{
|
||||||
|
kfree(layer);
|
||||||
|
}
|
||||||
|
|
||||||
static struct packet_type caif_usb_type __read_mostly = {
|
static struct packet_type caif_usb_type __read_mostly = {
|
||||||
.type = cpu_to_be16(ETH_P_802_EX1),
|
.type = cpu_to_be16(ETH_P_802_EX1),
|
||||||
};
|
};
|
||||||
|
@ -127,6 +132,7 @@ static int cfusbl_device_notify(struct notifier_block *me, unsigned long what,
|
||||||
struct cflayer *layer, *link_support;
|
struct cflayer *layer, *link_support;
|
||||||
struct usbnet *usbnet;
|
struct usbnet *usbnet;
|
||||||
struct usb_device *usbdev;
|
struct usb_device *usbdev;
|
||||||
|
int res;
|
||||||
|
|
||||||
/* Check whether we have a NCM device, and find its VID/PID. */
|
/* Check whether we have a NCM device, and find its VID/PID. */
|
||||||
if (!(dev->dev.parent && dev->dev.parent->driver &&
|
if (!(dev->dev.parent && dev->dev.parent->driver &&
|
||||||
|
@ -169,8 +175,11 @@ static int cfusbl_device_notify(struct notifier_block *me, unsigned long what,
|
||||||
if (dev->num_tx_queues > 1)
|
if (dev->num_tx_queues > 1)
|
||||||
pr_warn("USB device uses more than one tx queue\n");
|
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);
|
&layer, &caif_usb_type.func);
|
||||||
|
if (res)
|
||||||
|
goto err;
|
||||||
|
|
||||||
if (!pack_added)
|
if (!pack_added)
|
||||||
dev_add_pack(&caif_usb_type);
|
dev_add_pack(&caif_usb_type);
|
||||||
pack_added = true;
|
pack_added = true;
|
||||||
|
@ -178,6 +187,9 @@ static int cfusbl_device_notify(struct notifier_block *me, unsigned long what,
|
||||||
strlcpy(layer->name, dev->name, sizeof(layer->name));
|
strlcpy(layer->name, dev->name, sizeof(layer->name));
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
err:
|
||||||
|
cfusbl_release(link_support);
|
||||||
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct notifier_block caif_device_notifier = {
|
static struct notifier_block caif_device_notifier = {
|
||||||
|
|
Loading…
Reference in a new issue