From 9ef95d83643393432f42e70e71c9e991bd1b1d91 Mon Sep 17 00:00:00 2001 From: Yu Liao Date: Wed, 15 Dec 2021 17:30:00 +0800 Subject: [PATCH] Revert "timekeeping: Avoid undefined behaviour in 'ktime_get_with_offset()'" hulk inclusion category: bugfix bugzilla: 185900, https://gitee.com/openeuler/kernel/issues/I4MOGB CVE: NA ------------------------------------------------- This reverts commit 85d6dbdf051d7efdbd1a82fe9e57dc9e8b97d993. Commit 7a8e61f84786 force upper bound for setting CLOCK_REALTIME. The realtime is limited, so just revert it. Signed-off-by: Yu Liao Reviewed-by: Xiongfeng Wang Signed-off-by: Yang Yingliang --- kernel/time/timekeeping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 17ba0a2f5f5d..5a91ac540a47 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -798,7 +798,7 @@ ktime_t ktime_get_with_offset(enum tk_offsets offs) do { seq = read_seqcount_begin(&tk_core.seq); - base = ktime_add_safe(tk->tkr_mono.base, *offset); + base = ktime_add(tk->tkr_mono.base, *offset); nsecs = timekeeping_get_ns(&tk->tkr_mono); } while (read_seqcount_retry(&tk_core.seq, seq)); -- GitLab