aio: add timeout validity check for io_[p]getevents
diff mbox series

Message ID 1564039289-7672-1-git-send-email-yi.zhang@huawei.com
State New
Headers show
Series
  • aio: add timeout validity check for io_[p]getevents
Related show

Commit Message

zhangyi (F) July 25, 2019, 7:21 a.m. UTC
io_[p]getevents syscall should return -EINVAL if if timeout is out of
range, add this validity check.

Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
---
 fs/aio.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

Comments

Jeff Moyer July 25, 2019, 2:43 p.m. UTC | #1
"zhangyi (F)" <yi.zhang@huawei.com> writes:

> io_[p]getevents syscall should return -EINVAL if if timeout is out of
> range, add this validity check.
>
> Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
> ---
>  fs/aio.c | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/fs/aio.c b/fs/aio.c
> index 01e0fb9..dd967a0 100644
> --- a/fs/aio.c
> +++ b/fs/aio.c
> @@ -2031,10 +2031,17 @@ static long do_io_getevents(aio_context_t ctx_id,
>  		struct io_event __user *events,
>  		struct timespec64 *ts)
>  {
> -	ktime_t until = ts ? timespec64_to_ktime(*ts) : KTIME_MAX;
> -	struct kioctx *ioctx = lookup_ioctx(ctx_id);
> +	ktime_t until = KTIME_MAX;
> +	struct kioctx *ioctx = NULL;
>  	long ret = -EINVAL;
>  
> +	if (ts) {
> +		if (!timespec64_valid(ts))
> +			return ret;
> +		until = timespec64_to_ktime(*ts);
> +	}
> +
> +	ioctx = lookup_ioctx(ctx_id);
>  	if (likely(ioctx)) {
>  		if (likely(min_nr <= nr && min_nr >= 0))
>  			ret = read_events(ioctx, min_nr, nr, events, until);

Reviewed-by: Jeff Moyer <jmoyer@redhat.com>

The previous suggestion[1] of fixing the helpers never materialized, so
let's just get this fixed, already.

-Jeff

[1] https://marc.info/?l=linux-fsdevel&m=152209450618587&w=2
Jeff Moyer July 29, 2019, 2:57 p.m. UTC | #2
Al, can you take this through your tree?

Thanks,
Jeff

Jeff Moyer <jmoyer@redhat.com> writes:

> "zhangyi (F)" <yi.zhang@huawei.com> writes:
>
>> io_[p]getevents syscall should return -EINVAL if if timeout is out of
>> range, add this validity check.
>>
>> Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
>> ---
>>  fs/aio.c | 11 +++++++++--
>>  1 file changed, 9 insertions(+), 2 deletions(-)
>>
>> diff --git a/fs/aio.c b/fs/aio.c
>> index 01e0fb9..dd967a0 100644
>> --- a/fs/aio.c
>> +++ b/fs/aio.c
>> @@ -2031,10 +2031,17 @@ static long do_io_getevents(aio_context_t ctx_id,
>>  		struct io_event __user *events,
>>  		struct timespec64 *ts)
>>  {
>> -	ktime_t until = ts ? timespec64_to_ktime(*ts) : KTIME_MAX;
>> -	struct kioctx *ioctx = lookup_ioctx(ctx_id);
>> +	ktime_t until = KTIME_MAX;
>> +	struct kioctx *ioctx = NULL;
>>  	long ret = -EINVAL;
>>  
>> +	if (ts) {
>> +		if (!timespec64_valid(ts))
>> +			return ret;
>> +		until = timespec64_to_ktime(*ts);
>> +	}
>> +
>> +	ioctx = lookup_ioctx(ctx_id);
>>  	if (likely(ioctx)) {
>>  		if (likely(min_nr <= nr && min_nr >= 0))
>>  			ret = read_events(ioctx, min_nr, nr, events, until);
>
> Reviewed-by: Jeff Moyer <jmoyer@redhat.com>
>
> The previous suggestion[1] of fixing the helpers never materialized, so
> let's just get this fixed, already.
>
> -Jeff
>
> [1] https://marc.info/?l=linux-fsdevel&m=152209450618587&w=2
>
> --
> 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>
Al Viro July 29, 2019, 3:47 p.m. UTC | #3
On Mon, Jul 29, 2019 at 10:57:41AM -0400, Jeff Moyer wrote:
> Al, can you take this through your tree?

Umm...  Can do, but I had an impression that Arnd and Deepa
had a tree for timespec-related work.  OTOH, it had been
relatively quiet last cycle, so...  If they have nothing
in the area, I can take it through vfs.git.
Jeff Moyer July 29, 2019, 3:59 p.m. UTC | #4
Al Viro <viro@zeniv.linux.org.uk> writes:

> On Mon, Jul 29, 2019 at 10:57:41AM -0400, Jeff Moyer wrote:
>> Al, can you take this through your tree?
>
> Umm...  Can do, but I had an impression that Arnd and Deepa
> had a tree for timespec-related work.  OTOH, it had been
> relatively quiet last cycle, so...  If they have nothing
> in the area, I can take it through vfs.git.

Hmm, okay.  Yi, can you repost the patch, adding my Reviewed-by tag, and
CC-ing Arnd and Deepa:

Arnd Bergmann <arnd@arndb.de>
Deepa Dinamani <deepa.kernel@gmail.com>

Thanks!
Jeff
zhangyi (F) July 30, 2019, 1:28 a.m. UTC | #5
On 2019/7/29 23:59, Jeff Moyer Wrote:
> Al Viro <viro@zeniv.linux.org.uk> writes:
> 
>> On Mon, Jul 29, 2019 at 10:57:41AM -0400, Jeff Moyer wrote:
>>> Al, can you take this through your tree?
>>
>> Umm...  Can do, but I had an impression that Arnd and Deepa
>> had a tree for timespec-related work.  OTOH, it had been
>> relatively quiet last cycle, so...  If they have nothing
>> in the area, I can take it through vfs.git.
> 
> Hmm, okay.  Yi, can you repost the patch, adding my Reviewed-by tag, and
> CC-ing Arnd and Deepa:
>

Yes, will do.

Thanks,
Yi.

Patch
diff mbox series

diff --git a/fs/aio.c b/fs/aio.c
index 01e0fb9..dd967a0 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -2031,10 +2031,17 @@  static long do_io_getevents(aio_context_t ctx_id,
 		struct io_event __user *events,
 		struct timespec64 *ts)
 {
-	ktime_t until = ts ? timespec64_to_ktime(*ts) : KTIME_MAX;
-	struct kioctx *ioctx = lookup_ioctx(ctx_id);
+	ktime_t until = KTIME_MAX;
+	struct kioctx *ioctx = NULL;
 	long ret = -EINVAL;
 
+	if (ts) {
+		if (!timespec64_valid(ts))
+			return ret;
+		until = timespec64_to_ktime(*ts);
+	}
+
+	ioctx = lookup_ioctx(ctx_id);
 	if (likely(ioctx)) {
 		if (likely(min_nr <= nr && min_nr >= 0))
 			ret = read_events(ioctx, min_nr, nr, events, until);