viotape: Fix memory and semaphore leak
PATCH 1/1 viotape: Fix memory and semaphore leak
This patch fixes a memory and semaphore leak in the viotape driver's char device write op. It leaks the DMA memory and the semaphore lock in case the device was opened with O_NONBLOCK.
This patch is only compile tested, because I do not have the hardware.
--- drivers/char/viotape.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/char/viotape.c +10 -9
@@ -401,30 +401,31 @@ static ssize_t viotap_write(struct fileviopath_targetinst (viopath_hostLp), (u64 )(unsigned long )op,VIOVERSION <<16 , ((u64)devi.devno << 48) | op->dmaaddr, count, 0, 0);if (hvrc != HvLpEvent_Rc_Good) {printk (VIOTAPE_KERN_WARN "hv error on op %d\n" , (int )hvrc); ret = -EIO ; goto free_dma; } -if (noblock) -return count; - -wait_for_completion (&op->com); +if (noblock) { + ret = count; + }else { +wait_for_completion (&op->com); -if (op->rc) - ret =tape_rc_to_errno (op->rc,"write" , devi.devno); -else { -chg_state (devi.devno,VIOT_WRITING , file); - ret = op->count; +if (op->rc) + ret =tape_rc_to_errno (op->rc,"write" , devi.devno); +else { +chg_state (devi.devno,VIOT_WRITING , file); + ret = op->count; + } } free_dma:dma_free_coherent (op->dev, count, op->buffer, op->dmaaddr); up_sem:up (&reqSem); free_op:free_op_struct (op);return ret; }
Signature · 1 line
Greetings, Michael.
Quoted 7 lines · Michael Buesch
This patch fixes a memory and semaphore leak in the viotape driver's char device write op. It leaks the DMA memory and the semaphore lock in case the device was opened with
O_NONBLOCK.This patch is only compile tested, because I do not have the hardware.
Signed-off-by Michael Buesch <[email protected]>
(going trough my backlog ...)
Thanks Michael, but I don't think that's right...
IE. We aren't waiting for the write to complete, which means that it can be happening asynchronously, thus we must not free the DMA memory until it has actually complete.
Now, if you look at vioHandleTapeEvent(), it does appear that when the completion happens, the DMA memory will eventually be released and the mutex up'ed.
Or am I missing something ?
Cheers,
Ben.
Quoted 48 lines
--- drivers/char/viotape.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)drivers/char/viotape.c +10
-9@@ -401,30 +401,31 @@ static ssize_t viotap_write(struct fileviopath_targetinst (viopath_hostLp), (u64 )(unsigned long )op,VIOVERSION <<16 , ((u64)devi.devno << 48) | op->dmaaddr, count, 0, 0);if (hvrc != HvLpEvent_Rc_Good) {printk (VIOTAPE_KERN_WARN "hv error on op %d\n" , (int )hvrc); ret = -EIO ; goto free_dma; } -if (noblock) -return count; - -wait_for_completion (&op->com); +if (noblock) { + ret = count; + }else { +wait_for_completion (&op->com); -if (op->rc) - ret =tape_rc_to_errno (op->rc,"write" , devi.devno); -else { -chg_state (devi.devno,VIOT_WRITING , file); - ret = op->count; +if (op->rc) + ret =tape_rc_to_errno (op->rc,"write" , devi.devno); +else { +chg_state (devi.devno,VIOT_WRITING , file); + ret = op->count; + } } free_dma:dma_free_coherent (op->dev, count, op->buffer, op->dmaaddr); up_sem:up (&reqSem); free_op:free_op_struct (op);return ret; }
Quoted 17 lines · On Thursday 13 August 2009 07:00:03 Benjamin Herrenschmidt wrote:
Quoted 7 lines · Michael Buesch
This patch fixes a memory and semaphore leak in the viotape driver's char device write op. It leaks the DMA memory and the semaphore lock in case the device was opened with
O_NONBLOCK.This patch is only compile tested, because I do not have the hardware.
Signed-off-by Michael Buesch <[email protected]>(going trough my backlog ...)
Thanks Michael, but I don't think that's right...
IE. We aren't waiting for the write to complete, which means that it can be happening asynchronously, thus we must not free the DMA memory until it has actually complete.
Quoted 5 lines
Now, if you look at
vioHandleTapeEvent(), it does appear that when the completion happens, the DMA memory will eventually be released and the mutex up'ed.Or am I missing something ?
I think you are right.
Signature · 1 line
Greetings, Michael.