Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1733544 > unrolled thread
| Started by | Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
|---|---|
| First post | 2017-09-18 00:40 +0200 |
| Last post | 2017-09-18 18:10 +0200 |
| Articles | 4 — 2 participants |
Back to article view | Back to linux.kernel
[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
| From | Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
|---|---|
| Date | 2017-09-18 00:40 +0200 |
| Subject | [PATCH 0/2] rapidio: Two fixes for 'rio_dma_transfer()' |
| Message-ID | <uqQoh-5MT-1@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
|---|---|
| Date | 2017-09-18 00:40 +0200 |
| Subject | [PATCH 2/2] rapidio: Fix an error handling in 'rio_dma_transfer()' |
| Message-ID | <uqQoh-5MT-5@gated-at.bofh.it> |
| In reply to | #1733544 |
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
[toc] | [prev] | [next] | [standalone]
| From | Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
|---|---|
| Date | 2017-09-18 00:40 +0200 |
| Subject | [PATCH 1/2] rapidio: Fix resources leak in error handling path in 'rio_dma_transfer()' |
| Message-ID | <uqQoh-5MT-7@gated-at.bofh.it> |
| In reply to | #1733544 |
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
[toc] | [prev] | [next] | [standalone]
| From | Logan Gunthorpe <logang@deltatee.com> |
|---|---|
| Date | 2017-09-18 18:10 +0200 |
| Message-ID | <ur6Mq-8un-37@gated-at.bofh.it> |
| In reply to | #1733544 |
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(-) >
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web