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

!3944 time: Handle negative seconds correctly in timespec64_to_ns() 

Merge Pull Request from: @ci-robot 
 
PR sync from: liwei <liwei728@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/FR4XUV6WTHZNRR6J73NOGL2BCXJOHN6B/ 
 
https://gitee.com/openeuler/kernel/issues/I8MCB5 
 
Link:https://gitee.com/openeuler/kernel/pulls/3944

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents fc334a8c d7adf328

include/linux/time64.h

+7 −2
Original line number Diff line number Diff line
@@ -39,7 +39,9 @@ struct itimerspec64 { 
/* Located here for timespec[64]_valid_strict */

#define TIME64_MAX			((s64)~((u64)1 << 63))

#define KTIME_MAX			((s64)~((u64)1 << 63))

#define KTIME_MIN			(-KTIME_MAX - 1)

#define KTIME_SEC_MAX			(KTIME_MAX / NSEC_PER_SEC)

#define KTIME_SEC_MIN			(KTIME_MIN / NSEC_PER_SEC)



/*

 * Limits for settimeofday():
@@ -140,10 +142,13 @@ static inline bool timespec64_valid_settod(const struct timespec64 *ts) 
 */

static inline s64 timespec64_to_ns(const struct timespec64 *ts)

{

	/* Prevent multiplication overflow */

	if ((unsigned long long)ts->tv_sec >= KTIME_SEC_MAX)

	/* Prevent multiplication overflow / underflow */

	if (ts->tv_sec >= KTIME_SEC_MAX)

		return KTIME_MAX;



	if (ts->tv_sec <= KTIME_SEC_MIN)

		return KTIME_MIN;



	return ((s64) ts->tv_sec * NSEC_PER_SEC) + ts->tv_nsec;

}