| From e27d4b30b71c66986196d8a1eb93cba9f602904a Mon Sep 17 00:00:00 2001 |
| From: Wei Yongjun <weiyongjun1@huawei.com> |
| Date: Thu, 7 May 2020 05:13:23 +0000 |
| Subject: usb: gadget: legacy: fix error return code in gncm_bind() |
| |
| From: Wei Yongjun <weiyongjun1@huawei.com> |
| |
| commit e27d4b30b71c66986196d8a1eb93cba9f602904a upstream. |
| |
| If 'usb_otg_descriptor_alloc()' fails, we must return a |
| negative error code -ENOMEM, not 0. |
| |
| Fixes: 1156e91dd7cc ("usb: gadget: ncm: allocate and init otg descriptor by otg capabilities") |
| Reported-by: Hulk Robot <hulkci@huawei.com> |
| Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> |
| Signed-off-by: Felipe Balbi <balbi@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/gadget/legacy/ncm.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/usb/gadget/legacy/ncm.c |
| +++ b/drivers/usb/gadget/legacy/ncm.c |
| @@ -156,8 +156,10 @@ static int gncm_bind(struct usb_composit |
| struct usb_descriptor_header *usb_desc; |
| |
| usb_desc = usb_otg_descriptor_alloc(gadget); |
| - if (!usb_desc) |
| + if (!usb_desc) { |
| + status = -ENOMEM; |
| goto fail; |
| + } |
| usb_otg_descriptor_init(gadget, usb_desc); |
| otg_desc[0] = usb_desc; |
| otg_desc[1] = NULL; |
