Skip to content

Commit ffca476

Browse files
johnhubbardtorvalds
authored andcommitted
rapidio: fix an error in get_user_pages_fast() error handling
In the case of get_user_pages_fast() returning fewer pages than requested, rio_dma_transfer() does not quite do the right thing. It attempts to release all the pages that were requested, rather than just the pages that were pinned. Fix the error handling so that only the pages that were successfully pinned are released. Fixes: e8de370 ("rapidio: add mport char device driver") Signed-off-by: John Hubbard <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Reviewed-by: Andrew Morton <[email protected]> Cc: Matt Porter <[email protected]> Cc: Alexandre Bounine <[email protected]> Cc: Sumit Semwal <[email protected]> Cc: Dan Carpenter <[email protected]> Cc: <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Linus Torvalds <[email protected]>
1 parent c071b0f commit ffca476

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

drivers/rapidio/devices/rio_mport_cdev.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -877,6 +877,11 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,
877877
rmcd_error("pinned %ld out of %ld pages",
878878
pinned, nr_pages);
879879
ret = -EFAULT;
880+
/*
881+
* Set nr_pages up to mean "how many pages to unpin, in
882+
* the error handler:
883+
*/
884+
nr_pages = pinned;
880885
goto err_pg;
881886
}
882887

0 commit comments

Comments
 (0)