lkml.org 
[lkml]   [2021]   [Jan]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 61/77] USB: gadget: legacy: fix return error code in acm_ms_bind()
    Date
    From: Yang Yingliang <yangyingliang@huawei.com>

    commit c91d3a6bcaa031f551ba29a496a8027b31289464 upstream.

    If usb_otg_descriptor_alloc() failed, it need return ENOMEM.

    Fixes: 578aa8a2b12c ("usb: gadget: acm_ms: allocate and init otg descriptor by otg capabilities")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Yang 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/gadget/legacy/acm_ms.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/drivers/usb/gadget/legacy/acm_ms.c
    +++ b/drivers/usb/gadget/legacy/acm_ms.c
    @@ -203,8 +203,10 @@ static int acm_ms_bind(struct usb_compos
    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;

    \
     
     \ /
      Last update: 2021-01-11 14:49    [W:4.045 / U:1.640 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site