diff options
| author | Michael Grzeschik <m.grzeschik@pengutronix.de> | 2013-04-04 13:13:47 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-05 14:09:12 -0700 |
| commit | 7ca2cd291fd84ae499390f227a255ccba2780a81 (patch) | |
| tree | 2ba98c5b51618154fb741882d2fa5a7ec8a1f612 /drivers/usb/chipidea | |
| parent | a9c174302b1590ef3ead485d804a303c5f89174b (diff) | |
| download | blackbird-op-linux-7ca2cd291fd84ae499390f227a255ccba2780a81.tar.gz blackbird-op-linux-7ca2cd291fd84ae499390f227a255ccba2780a81.zip | |
usb: chipidea: udc: fix memory leak in _ep_nuke
In hardware_enqueue code adds one extra td with dma_pool_alloc if
mReq->req.zero is true. When _ep_nuke will be called for that endpoint,
dma_pool_free will not be called to free that memory again. That patch
fixes this.
Cc: stable <stable@vger.kernel.org> # v3.5
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/chipidea')
| -rw-r--r-- | drivers/usb/chipidea/udc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c index b4cac44ce26c..3d90e6189731 100644 --- a/drivers/usb/chipidea/udc.c +++ b/drivers/usb/chipidea/udc.c @@ -540,6 +540,12 @@ __acquires(mEp->lock) struct ci13xxx_req *mReq = \ list_entry(mEp->qh.queue.next, struct ci13xxx_req, queue); + + if (mReq->zptr) { + dma_pool_free(mEp->td_pool, mReq->zptr, mReq->zdma); + mReq->zptr = NULL; + } + list_del_init(&mReq->queue); mReq->req.status = -ESHUTDOWN; |
