Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 29 Jul 2026 17:50:30 +0000
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: e1c9b0b13a29 - releng/15.1 - ktimer: Check for errors from realtimer_gettime()
Message-ID:  <6a6a3d66.3be21.5a0810e5@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch releng/15.1 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=e1c9b0b13a29f69d18dcc24359d7830a9493c5d5

commit e1c9b0b13a29f69d18dcc24359d7830a9493c5d5
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2026-07-17 13:08:33 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2026-07-28 17:34:40 +0000

    ktimer: Check for errors from realtimer_gettime()
    
    clock_gettime(CLOCK_TAI) can fail, leaving *ovalue uninitialized.
    
    Approved by:    so
    Security:       FreeBSD-SA-26:51.ktimer
    Security:       CVE-2026-58084
    Reported by:    Hazley Samsudin of GovTech CSG
    MFC after:      3 days
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D58225
    
    (cherry picked from commit 2f1ec7d159cbe56d40e7b6d7fc4188c9079e1783)
    (cherry picked from commit a4b5ff57ef85031ba52feb70c754ba77f7c92cb0)
---
 sys/kern/kern_time.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index 5b7485c25cd7..3e8117c40adc 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -1631,8 +1631,11 @@ realtimer_settime(struct itimer *it, int flags, struct itimerspec *value,
 		timespecclear(&val.it_interval);
 	}
 
-	if (ovalue != NULL)
-		realtimer_gettime(it, ovalue);
+	if (ovalue != NULL) {
+		error = realtimer_gettime(it, ovalue);
+		if (error != 0)
+			return (error);
+	}
 
 	it->it_time = val;
 	if (timespecisset(&val.it_value)) {


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a6a3d66.3be21.5a0810e5>