lkml.org 
[lkml]   [2014]   [May]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH] aio: fix potential leak in aio_run_iocb().
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@gmail.com>
> ---
> 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."


\
 
 \ /
  Last update: 2014-05-01 15:21    [W:0.044 / U:0.136 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site