Commit 980193e2 authored Jan 28, 2021 by Dan Carpenter Committed by Greg Kroah-Hartman Feb 10, 2021

USB: gadget: legacy: fix an error code in eth_bind()



commit 3e1f4a2e1184ae6ad7f4caf682ced9554141a0f4 upstream.

This code should return -ENOMEM if the allocation fails but it currently
returns success.

Fixes: 9b95236e ("usb: gadget: ether: allocate and init otg descriptor by otg capabilities")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/YBKE9rqVuJEOUWpW@mwanda


Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 3140b074

drivers/usb/gadget/legacy/ether.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -407,8 +407,10 @@ static int eth_bind(struct usb_composite_dev *cdev)
	struct usb_descriptor_header *usb_desc;		struct usb_descriptor_header *usb_desc;

	usb_desc = usb_otg_descriptor_alloc(gadget);		usb_desc = usb_otg_descriptor_alloc(gadget);
	if (!usb_desc)		if (!usb_desc) {
			status = -ENOMEM;
	goto fail1;		goto fail1;
			}
	usb_otg_descriptor_init(gadget, usb_desc);		usb_otg_descriptor_init(gadget, usb_desc);
	otg_desc[0] = usb_desc;		otg_desc[0] = usb_desc;
	otg_desc[1] = NULL;		otg_desc[1] = NULL;