Commit 50f925d2 authored by Xiongfeng Wang's avatar Xiongfeng Wang
Browse files

Revert "ntp: Avoid undefined behaviour in second_overflow()" 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAYQRI


CVE: NA

--------------------------------

This reverts commit d8df4fe5.
Revert hulk inclusion patch. The next patch will apply the mainline
modification.

Fixes: d8df4fe5 ("ntp: Avoid undefined behaviour in second_overflow()")
Signed-off-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
parent eec0cedc

kernel/time/ntp.c

+0 −2
Original line number Diff line number Diff line
@@ -687,8 +687,6 @@ static inline void process_adjtimex_modes(const struct timex *txc, s32 *time_tai 


	if (txc->modes & ADJ_MAXERROR)

		time_maxerror = txc->maxerror;

	if (time_maxerror > NTP_PHASE_LIMIT)

		time_maxerror = NTP_PHASE_LIMIT;



	if (txc->modes & ADJ_ESTERROR)

		time_esterror = txc->esterror;