Commit ffca476a authored by John Hubbard's avatar John Hubbard Committed by Linus Torvalds

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: e8de3701 ("rapidio: add mport char device driver")
Signed-off-by: default avatarJohn Hubbard <>
Signed-off-by: default avatarAndrew Morton <>
Reviewed-by: default avatarAndrew Morton <>
Cc: Matt Porter <>
Cc: Alexandre Bounine <>
Cc: Sumit Semwal <>
Cc: Dan Carpenter <>
Cc: <>
Link: default avatarLinus Torvalds <>
parent c071b0f1
......@@ -877,6 +877,11 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,
rmcd_error("pinned %ld out of %ld pages",
pinned, nr_pages);
ret = -EFAULT;
* Set nr_pages up to mean "how many pages to unpin, in
* the error handler:
nr_pages = pinned;
goto err_pg;
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment