[PATCH 0/2] rapidio: Two fixes for 'rio_dma_transfer()'

[PATCH 0/2] rapidio: Two fixes for 'rio_dma_transfer()'

[Christophe JAILLET]

These 2 patches are really close and are both related to error handling
in 'rio_dma_transfer()'.
The first one fixes some resources leak in case of error.
The 2nd one fixes a test so that the corresponding error can be handled
correctly.

I've splitted this into 2 paches because the first one looks trivial to me.
But the 2nd one should require more attention, IMO. The existing error
handling was dead code because 'dma_map_sg()' can not return -EFAULT. So
this error handling code has never been executed/tested and I can't test it
myself.

Christophe JAILLET (2):
  rapidio: Fix resources leak in error handling path in
    'rio_dma_transfer()'
  rapidio: Fix an error handling in 'rio_dma_transfer()'

 drivers/rapidio/devices/rio_mport_cdev.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

-- 
2.11.0

[PATCH 0/2] rapidio: Two fixes for 'rio_dma_transfer()'

[Christophe JAILLET]

These 2 patches are really close and are both related to error handling
in 'rio_dma_transfer()'.
The first one fixes some resources leak in case of error.
The 2nd one fixes a test so that the corresponding error can be handled
correctly.

I've splitted this into 2 paches because the first one looks trivial to me.
But the 2nd one should require more attention, IMO. The existing error
handling was dead code because 'dma_map_sg()' can not return -EFAULT. So
this error handling code has never been executed/tested and I can't test it
myself.

Christophe JAILLET (2):
  rapidio: Fix resources leak in error handling path in
    'rio_dma_transfer()'
  rapidio: Fix an error handling in 'rio_dma_transfer()'

 drivers/rapidio/devices/rio_mport_cdev.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

-- 
2.11.0

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

[Christophe JAILLET]

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

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

[Christophe JAILLET]

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

[PATCH 2/2] rapidio: Fix an error handling in 'rio_dma_transfer()'

[Christophe JAILLET]

In case of error, 'dma_map_sg()' returns 0, not a negative value.
There is BUG_ON() in 'dma_map_sg_attrs()'  which makes sure of that.

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

diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c
index 76afe1449cab..3dd37e35cf4e 100644
--- a/drivers/rapidio/devices/rio_mport_cdev.c
+++ b/drivers/rapidio/devices/rio_mport_cdev.c
@@ -961,7 +961,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,
 
 	nents = dma_map_sg(chan->device->dev,
 			   req->sgt.sgl, req->sgt.nents, dir);
-	if (nents == -EFAULT) {
+	if (nents == 0) {
 		rmcd_error("Failed to map SG list");
 		ret = -EFAULT;
 		goto err_pg;
-- 
2.11.0

[PATCH 2/2] rapidio: Fix an error handling in 'rio_dma_transfer()'

[Christophe JAILLET]

In case of error, 'dma_map_sg()' returns 0, not a negative value.
There is BUG_ON() in 'dma_map_sg_attrs()'  which makes sure of that.

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

diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c
index 76afe1449cab..3dd37e35cf4e 100644
--- a/drivers/rapidio/devices/rio_mport_cdev.c
+++ b/drivers/rapidio/devices/rio_mport_cdev.c
@@ -961,7 +961,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,
 
 	nents = dma_map_sg(chan->device->dev,
 			   req->sgt.sgl, req->sgt.nents, dir);
-	if (nents = -EFAULT) {
+	if (nents = 0) {
 		rmcd_error("Failed to map SG list");
 		ret = -EFAULT;
 		goto err_pg;
-- 
2.11.0

Re: [PATCH 0/2] rapidio: Two fixes for 'rio_dma_transfer()'

[Logan Gunthorpe]

Hey,

I don't have any relation to the rapidio code short of making a small 
change to an API it used. But I reviewed both patches and they look 
correct to me.

Reviewed-by: Logan Gunthorpe <logang@deltatee.com>

Logan

On 17/09/17 04:33 PM, Christophe JAILLET wrote:
> These 2 patches are really close and are both related to error handling
> in 'rio_dma_transfer()'.
> The first one fixes some resources leak in case of error.
> The 2nd one fixes a test so that the corresponding error can be handled
> correctly.
> 
> I've splitted this into 2 paches because the first one looks trivial to me.
> But the 2nd one should require more attention, IMO. The existing error
> handling was dead code because 'dma_map_sg()' can not return -EFAULT. So
> this error handling code has never been executed/tested and I can't test it
> myself.
> 
> Christophe JAILLET (2):
>    rapidio: Fix resources leak in error handling path in
>      'rio_dma_transfer()'
>    rapidio: Fix an error handling in 'rio_dma_transfer()'
> 
>   drivers/rapidio/devices/rio_mport_cdev.c | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
> 

Re: [PATCH 0/2] rapidio: Two fixes for 'rio_dma_transfer()'

[Logan Gunthorpe]

Hey,

I don't have any relation to the rapidio code short of making a small 
change to an API it used. But I reviewed both patches and they look 
correct to me.

Reviewed-by: Logan Gunthorpe <logang@deltatee.com>

Logan

On 17/09/17 04:33 PM, Christophe JAILLET wrote:
> These 2 patches are really close and are both related to error handling
> in 'rio_dma_transfer()'.
> The first one fixes some resources leak in case of error.
> The 2nd one fixes a test so that the corresponding error can be handled
> correctly.
> 
> I've splitted this into 2 paches because the first one looks trivial to me.
> But the 2nd one should require more attention, IMO. The existing error
> handling was dead code because 'dma_map_sg()' can not return -EFAULT. So
> this error handling code has never been executed/tested and I can't test it
> myself.
> 
> Christophe JAILLET (2):
>    rapidio: Fix resources leak in error handling path in
>      'rio_dma_transfer()'
>    rapidio: Fix an error handling in 'rio_dma_transfer()'
> 
>   drivers/rapidio/devices/rio_mport_cdev.c | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
>