All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Lukáš Czerner" <lczerner@redhat.com>
To: Leon Yu <chianglungyu@gmail.com>
Cc: Benjamin LaHaise <bcrl@kvack.org>,
	Alexander Viro <viro@zeniv.linux.org.uk>,
	linux-aio@kvack.org, linux-fsdevel@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] aio: fix potential leak in aio_run_iocb().
Date: Fri, 2 May 2014 10:46:32 +0200 (CEST)	[thread overview]
Message-ID: <alpine.LFD.2.00.1405021041250.2154@localhost.localdomain> (raw)
In-Reply-To: <1398915088-8472-1-git-send-email-chianglungyu@gmail.com>

On Thu, 1 May 2014, Leon Yu wrote:

> Date: Thu,  1 May 2014 03:31:28 +0000
> From: Leon Yu <chianglungyu@gmail.com>
> To: Benjamin LaHaise <bcrl@kvack.org>,
>     Alexander Viro <viro@zeniv.linux.org.uk>
> Cc: linux-aio@kvack.org, linux-fsdevel@vger.kernel.org,
>     linux-kernel@vger.kernel.org, Leon Yu <chianglungyu@gmail.com>
> Subject: [PATCH] aio: fix potential leak in aio_run_iocb().
> 
> 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.


Hi,

this does not seem right, see bellow

> 
> 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);

here ret could be possibly set to a positive number.

> +		if (!ret)
> +			ret = rw_verify_area(rw, file, &req->ki_pos, req->ki_nbytes);
>  		if (ret < 0) {

but here we're checking for negative and bail out. However this
changes the way it worked before this patch and the iovec would not
be reclaimed anyway as you mentioned in the commit description.

Thanks!
-Lukas

>  			if (iovec != &inline_vec)
>  				kfree(iovec);


WARNING: multiple messages have this Message-ID (diff)
From: "Lukáš Czerner" <lczerner@redhat.com>
To: Leon Yu <chianglungyu@gmail.com>
Cc: Benjamin LaHaise <bcrl@kvack.org>,
	Alexander Viro <viro@zeniv.linux.org.uk>,
	linux-aio@kvack.org, linux-fsdevel@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] aio: fix potential leak in aio_run_iocb().
Date: Fri, 2 May 2014 10:46:32 +0200 (CEST)	[thread overview]
Message-ID: <alpine.LFD.2.00.1405021041250.2154@localhost.localdomain> (raw)
In-Reply-To: <1398915088-8472-1-git-send-email-chianglungyu@gmail.com>

On Thu, 1 May 2014, Leon Yu wrote:

> Date: Thu,  1 May 2014 03:31:28 +0000
> From: Leon Yu <chianglungyu@gmail.com>
> To: Benjamin LaHaise <bcrl@kvack.org>,
>     Alexander Viro <viro@zeniv.linux.org.uk>
> Cc: linux-aio@kvack.org, linux-fsdevel@vger.kernel.org,
>     linux-kernel@vger.kernel.org, Leon Yu <chianglungyu@gmail.com>
> Subject: [PATCH] aio: fix potential leak in aio_run_iocb().
> 
> 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.


Hi,

this does not seem right, see bellow

> 
> 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);

here ret could be possibly set to a positive number.

> +		if (!ret)
> +			ret = rw_verify_area(rw, file, &req->ki_pos, req->ki_nbytes);
>  		if (ret < 0) {

but here we're checking for negative and bail out. However this
changes the way it worked before this patch and the iovec would not
be reclaimed anyway as you mentioned in the commit description.

Thanks!
-Lukas

>  			if (iovec != &inline_vec)
>  				kfree(iovec);

--
To unsubscribe, send a message with 'unsubscribe linux-aio' in
the body to majordomo@kvack.org.  For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"aart@kvack.org">aart@kvack.org</a>

  parent reply	other threads:[~2014-05-02  8:46 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-01  3:31 [PATCH] aio: fix potential leak in aio_run_iocb() Leon Yu
2014-05-01  3:31 ` Leon Yu
2014-05-01  6:24 ` Mateusz Guzik
2014-05-01  6:24   ` Mateusz Guzik
2014-05-01 12:39 ` Benjamin LaHaise
2014-05-01 12:39   ` Benjamin LaHaise
2014-05-02  8:46 ` Lukáš Czerner [this message]
2014-05-02  8:46   ` Lukáš Czerner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=alpine.LFD.2.00.1405021041250.2154@localhost.localdomain \
    --to=lczerner@redhat.com \
    --cc=bcrl@kvack.org \
    --cc=chianglungyu@gmail.com \
    --cc=linux-aio@kvack.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=viro@zeniv.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.