Unverified Commit 0733751e authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3850 aio: add timeout validity check for io_[p 

Merge Pull Request from: @ci-robot 
 
PR sync from: Baokun Li <libaokun1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/ZGG5VAG6Y2ACEQAIKNCEAUXQSMID3M2D/ 
 
https://gitee.com/openeuler/kernel/issues/I8U48M 
 
Link:https://gitee.com/openeuler/kernel/pulls/3850

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 6fb74cb6 8f6d6fd1

fs/aio.c

+9 −2
Original line number Diff line number Diff line
@@ -2170,10 +2170,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);