public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] misc: genwqe: Fix potential memory leak when pinning memory
@ 2014-01-25 21:47 Christian Engelmayer
  2014-01-27  9:11 ` Frank Haverkamp
  0 siblings, 1 reply; 2+ messages in thread
From: Christian Engelmayer @ 2014-01-25 21:47 UTC (permalink / raw)
  To: Frank Haverkamp, Greg Kroah-Hartman; +Cc: linux-kernel

Fix a memory leak in the genwqe_pin_mem() error path as called by
ioctl GENWQE_PIN_MEM. In case there is an error encountered when
mapping memory, the already allocated dma_mapping struct needs to
be freed correctly.

Detected by Coverity: CID 1162606.

Signed-off-by: Christian Engelmayer <cengelma@gmx.at>
---
 drivers/misc/genwqe/card_dev.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/misc/genwqe/card_dev.c b/drivers/misc/genwqe/card_dev.c
index 8f8a6b3..2c2c9cc 100644
--- a/drivers/misc/genwqe/card_dev.c
+++ b/drivers/misc/genwqe/card_dev.c
@@ -787,6 +787,7 @@ static int genwqe_pin_mem(struct genwqe_file *cfile, struct genwqe_mem *m)
 	if (rc != 0) {
 		dev_err(&pci_dev->dev,
 			"[%s] genwqe_user_vmap rc=%d\n", __func__, rc);
+		kfree(dma_map);
 		return rc;
 	}
 
-- 
1.8.3.2

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] misc: genwqe: Fix potential memory leak when pinning memory
  2014-01-25 21:47 [PATCH] misc: genwqe: Fix potential memory leak when pinning memory Christian Engelmayer
@ 2014-01-27  9:11 ` Frank Haverkamp
  0 siblings, 0 replies; 2+ messages in thread
From: Frank Haverkamp @ 2014-01-27  9:11 UTC (permalink / raw)
  To: Christian Engelmayer; +Cc: Greg Kroah-Hartman, linux-kernel, haver

Hi Christian,

Am Samstag, den 25.01.2014, 22:47 +0100 schrieb Christian Engelmayer:
> Fix a memory leak in the genwqe_pin_mem() error path as called by
> ioctl GENWQE_PIN_MEM. In case there is an error encountered when
> mapping memory, the already allocated dma_mapping struct needs to
> be freed correctly.
> 
> Detected by Coverity: CID 1162606.
> 
> Signed-off-by: Christian Engelmayer <cengelma@gmx.at>
> ---
>  drivers/misc/genwqe/card_dev.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/misc/genwqe/card_dev.c b/drivers/misc/genwqe/card_dev.c
> index 8f8a6b3..2c2c9cc 100644
> --- a/drivers/misc/genwqe/card_dev.c
> +++ b/drivers/misc/genwqe/card_dev.c
> @@ -787,6 +787,7 @@ static int genwqe_pin_mem(struct genwqe_file *cfile, struct genwqe_mem *m)
>  	if (rc != 0) {
>  		dev_err(&pci_dev->dev,
>  			"[%s] genwqe_user_vmap rc=%d\n", __func__, rc);
> +		kfree(dma_map);
>  		return rc;
>  	}
> 

thanks for discovering and fixing the problem.

Acked-by: Frank Haverkamp <haver@linux.vnet.ibm.com>


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-01-27  9:11 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-25 21:47 [PATCH] misc: genwqe: Fix potential memory leak when pinning memory Christian Engelmayer
2014-01-27  9:11 ` Frank Haverkamp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox