Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55dfcc21 authored by Yang Yingliang's avatar Yang Yingliang Committed by Greg Kroah-Hartman
Browse files

USB: gadget: legacy: fix return error code in acm_ms_bind() 



commit c91d3a6bcaa031f551ba29a496a8027b31289464 upstream.

If usb_otg_descriptor_alloc() failed, it need return ENOMEM.

Fixes: 578aa8a2 ("usb: gadget: acm_ms: allocate and init otg descriptor by otg capabilities")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20201117092955.4102785-1-yangyingliang@huawei.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 725675bc

drivers/usb/gadget/legacy/acm_ms.c

+3 −1
Original line number Diff line number Diff line
@@ -207,8 +207,10 @@ static int acm_ms_bind(struct usb_composite_dev *cdev) 
		struct usb_descriptor_header *usb_desc;



		usb_desc = usb_otg_descriptor_alloc(gadget);

		if (!usb_desc)

		if (!usb_desc) {

			status = -ENOMEM;

			goto fail_string_ids;

		}

		usb_otg_descriptor_init(gadget, usb_desc);

		otg_desc[0] = usb_desc;

		otg_desc[1] = NULL;