lkml.org 
[lkml]   [2017]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 80/93] usb: gadget: udc: atmel: remove memory leak
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Alexandre Belloni <alexandre.belloni@free-electrons.com>

    [ Upstream commit 32856eea7bf75dfb99b955ada6e147f553a11366 ]

    Commit bbe097f092b0 ("usb: gadget: udc: atmel: fix endpoint name")
    introduced a memory leak when unbinding the driver. The endpoint names
    would not be freed. Solve that by including the name as a string in struct
    usba_ep so it is freed when the endpoint is.

    Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
    Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/usb/gadget/udc/atmel_usba_udc.c | 3 ++-
    drivers/usb/gadget/udc/atmel_usba_udc.h | 1 +
    2 files changed, 3 insertions(+), 1 deletion(-)

    --- a/drivers/usb/gadget/udc/atmel_usba_udc.c
    +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
    @@ -1978,7 +1978,8 @@ static struct usba_ep * atmel_udc_of_ini
    dev_err(&pdev->dev, "of_probe: name error(%d)\n", ret);
    goto err;
    }
    - ep->ep.name = kasprintf(GFP_KERNEL, "ep%d", ep->index);
    + sprintf(ep->name, "ep%d", ep->index);
    + ep->ep.name = ep->name;

    ep->ep_regs = udc->regs + USBA_EPT_BASE(i);
    ep->dma_regs = udc->regs + USBA_DMA_BASE(i);
    --- a/drivers/usb/gadget/udc/atmel_usba_udc.h
    +++ b/drivers/usb/gadget/udc/atmel_usba_udc.h
    @@ -280,6 +280,7 @@ struct usba_ep {
    void __iomem *ep_regs;
    void __iomem *dma_regs;
    void __iomem *fifo;
    + char name[8];
    struct usb_ep ep;
    struct usba_udc *udc;


    \
     
     \ /
      Last update: 2017-03-20 19:25    [W:4.580 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site