Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1733547

[PATCH 1/2] rapidio: Fix resources leak in error handling path in 'rio_dma_transfer()'

From Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Newsgroups linux.kernel
Subject [PATCH 1/2] rapidio: Fix resources leak in error handling path in 'rio_dma_transfer()'
Date 2017-09-18 00:40 +0200
Message-ID <uqQoh-5MT-7@gated-at.bofh.it> (permalink)
References <uqQoh-5MT-1@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


If 'dma_map_sg()', we should branch to the existing error handling path to
free some resources before returning.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/rapidio/devices/rio_mport_cdev.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c
index 5beb0c361076..76afe1449cab 100644
--- a/drivers/rapidio/devices/rio_mport_cdev.c
+++ b/drivers/rapidio/devices/rio_mport_cdev.c
@@ -963,7 +963,8 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,
 			   req->sgt.sgl, req->sgt.nents, dir);
 	if (nents == -EFAULT) {
 		rmcd_error("Failed to map SG list");
-		return -EFAULT;
+		ret = -EFAULT;
+		goto err_pg;
 	}
 
 	ret = do_dma_request(req, xfer, sync, nents);
-- 
2.11.0

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 0/2] rapidio: Two fixes for 'rio_dma_transfer()' Christophe JAILLET <christophe.jaillet@wanadoo.fr> - 2017-09-18 00:40 +0200
  [PATCH 2/2] rapidio: Fix an error handling in 'rio_dma_transfer()' Christophe JAILLET <christophe.jaillet@wanadoo.fr> - 2017-09-18 00:40 +0200
  [PATCH 1/2] rapidio: Fix resources leak in error handling path in 'rio_dma_transfer()' Christophe JAILLET <christophe.jaillet@wanadoo.fr> - 2017-09-18 00:40 +0200
  Re: [PATCH 0/2] rapidio: Two fixes for 'rio_dma_transfer()' Logan Gunthorpe <logang@deltatee.com> - 2017-09-18 18:10 +0200

csiph-web