Commit 9367bdb6 authored by Jinjie Ruan's avatar Jinjie Ruan Committed by openeuler-sync-bot
Browse files

posix-clock: Fix missing timespec64 check in pc_clock_settime()

stable inclusion
from stable-v5.10.228
commit 673a1c5a2998acbd429d6286e6cad10f17f4f073
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB2YU9
CVE: CVE-2024-50195

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=673a1c5a2998acbd429d6286e6cad10f17f4f073



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

commit d8794ac20a299b647ba9958f6d657051fc51a540 upstream.

As Andrew pointed out, it will make sense that the PTP core
checked timespec64 struct's tv_sec and tv_nsec range before calling
ptp->info->settime64().

As the man manual of clock_settime() said, if tp.tv_sec is negative or
tp.tv_nsec is outside the range [0..999,999,999], it should return EINVAL,
which include dynamic clocks which handles PTP clock, and the condition is
consistent with timespec64_valid(). As Thomas suggested, timespec64_valid()
only check the timespec is valid, but not ensure that the time is
in a valid range, so check it ahead using timespec64_valid_strict()
in pc_clock_settime() and return -EINVAL if not valid.

There are some drivers that use tp->tv_sec and tp->tv_nsec directly to
write registers without validity checks and assume that the higher layer
has checked it, which is dangerous and will benefit from this, such as
hclge_ptp_settime(), igb_ptp_settime_i210(), _rcar_gen4_ptp_settime(),
and some drivers can remove the checks of itself.

Cc: stable@vger.kernel.org
Fixes: 0606f422 ("posix clocks: Introduce dynamic clocks")
Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Suggested-by: default avatarAndrew Lunn <andrew@lunn.ch>
Suggested-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarJinjie Ruan <ruanjinjie@huawei.com>
Link: https://patch.msgid.link/20241009072302.1754567-2-ruanjinjie@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGu Bowen <gubowen5@huawei.com>
(cherry picked from commit 6bc08af4)
parent 1d5beee4
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -299,6 +299,9 @@ static int pc_clock_settime(clockid_t id, const struct timespec64 *ts)
		goto out;
	}

	if (!timespec64_valid_strict(ts))
		return -EINVAL;

	if (cd.clk->ops.clock_settime)
		err = cd.clk->ops.clock_settime(cd.clk, ts);
	else