]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
misc: genwqe: check for error from get_user_pages_fast()
authorIan Abbott <abbotti@mev.co.uk>
Thu, 6 Nov 2014 16:23:39 +0000 (16:23 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Nov 2014 18:26:46 +0000 (10:26 -0800)
`genwqe_user_vmap()` calls `get_user_pages_fast()` and if the return
value is less than the number of pages requested, it frees the pages and
returns an error (`-EFAULT`).  However, it fails to consider a negative
error return value from `get_user_pages_fast()`.  In that case, the test
`if (rc < m->nr_pages)` will be false (due to promotion of `rc` to a
large `unsigned int`) and the code will continue on to call
`genwqe_map_pages()` with an invalid list of page pointers.  Fix it by
bailing out if `get_user_pages_fast()` returns a negative error value.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Cc: <stable@vger.kernel.org> # 3.14.x # 3.15.x # 3.16.x # 3.17.x
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/genwqe/card_utils.c

index 7cb3b7e4173997d21825cf15d3a060488665076a..1ca94e6fa8fbb54452ad70b72c466c203c1aab6c 100644 (file)
@@ -590,6 +590,8 @@ int genwqe_user_vmap(struct genwqe_dev *cd, struct dma_mapping *m, void *uaddr,
                                 m->nr_pages,
                                 1,             /* write by caller */
                                 m->page_list); /* ptrs to pages */
+       if (rc < 0)
+               goto fail_get_user_pages;
 
        /* assumption: get_user_pages can be killed by signals. */
        if (rc < m->nr_pages) {