On Thu, May 01, 2014 at 03:31:28AM +0000, Leon Yu wrote:
> iovec should be reclaimed whenever caller of rw_copy_check_uvector() returns,
> but it doesn't hold when failure happens right after aio_setup_vectored_rw().
>
> Fix that in a such way to avoid hairy goto.
Good catch -- applied.
-ben
> Signed-off-by: Leon Yu <chianglungyu@xxxxxxxxx>
> ---
> fs/aio.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/fs/aio.c b/fs/aio.c
> index 12a3de0e..04cd768 100644
> --- a/fs/aio.c
> +++ b/fs/aio.c
> @@ -1299,10 +1299,8 @@ rw_common:
> &iovec, compat)
> : aio_setup_single_vector(req, rw, buf, &nr_segs,
> iovec);
> - if (ret)
> - return ret;
> -
> - ret = rw_verify_area(rw, file, &req->ki_pos, req->ki_nbytes);
> + if (!ret)
> + ret = rw_verify_area(rw, file, &req->ki_pos, req->ki_nbytes);
> if (ret < 0) {
> if (iovec != &inline_vec)
> kfree(iovec);
> --
> 1.9.2
--
"Thought is the essence of where you are now."
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
