From nobody Wed Aug 6 21:26:56 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4by3Jw2yQCz64DxH; Wed, 06 Aug 2025 21:26:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4by3Jw2989z3HdT; Wed, 06 Aug 2025 21:26:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754515616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9LXm6AiGSh93QGeQOrKvO3OcnRoSxybv45a4HOvnOwE=; b=xT47+cN/cNS8xeHDMVTdxQ4Ws+fzZSn0Qc1eU5i2d1CYrj4woqj2W0RFBnXCLkpwAuAFSu 3RDWLaBXRt+0tsK9ZlMNePBK08l3IxSBeQeWJ3kc7P6iaVImGt9imOu147gv4VYuAon6wA gO1w0q+R8vgedaQsCzqHC754fmIXdf1HJkAORQ0gaPJcmZFhgpm5F7G+1R0K1LFBu1m5gY 5sELr3EeEf8Pa3rGCFs3/CBOBRU3BRQTu9UJH5Wa4Ru29+duKXe1nhmWnUJRq6ovNgXYXd BDT4k8NTDS9HdAgv1QQPQCgw0saguH5Rklhmuvsrv1D1DudKJhdjadRs89qXvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754515616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9LXm6AiGSh93QGeQOrKvO3OcnRoSxybv45a4HOvnOwE=; b=uKOzUPCGTH/HSjf0s34zjcpSxKDTs0hgNQdogRdIYpXgaksnWISekW5iajKk2eSK11ernM 3kVa7/sPWy6LKyrqXbdKnqNQWkTES8FUa6Mf9sP3zjlFKD2TT8A9qxfLOvyTYKELKgiNUq LpB/zM8uQU2sIP0a6sIsfo15vdFBUyakB1xgFkd9VQQi9zqZ6TEal7HyN+G8GExIgHAOkg gdHS35OoVL41FJw9iBzGwDTHPZ9xbt9kxMljKWkqjQqDgYBsZ1o4tGXBt/57OL868JtJTN Ds+4JLwGdil0hNM0+sRCpG07NtGbnmyk57+/XIT+305AcsPW9CYp1w1R32z4IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754515616; a=rsa-sha256; cv=none; b=dT7KRPYXPSPkhq6XRJeDwXt4y8z3fB64p7pL9To4RW0WNLpMr1ieqp4N3VHANKBfD+iKFN ZsQvHycJaNpeLzeDtwu9USYB2goCCZb6N8VnbsRUA5FW4jw81c8XxB8eL7iGqgu7el9mEK wBAeAeU4vI5bkTPRS4zcizrbD2byDLGzWVWb3bdVKHn67a4yJlvZIY0oLo6ZD1iNH2l98d EICo5VXiwOuOJ1ZKvhtbrq8pwGAPAClrE4uK8LIJK6VUCSMPtHOIJ09Z7LOdr27fnHejvM H+WIuVT4I/UGjY+LDpMEoiNIF8kE6cmWpMDS5tDzytK5q3Qb+n2F0B6Is2+cww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4by3Jw1ckPzdZV; Wed, 06 Aug 2025 21:26:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 576LQukU011112; Wed, 6 Aug 2025 21:26:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 576LQu5M011109; Wed, 6 Aug 2025 21:26:56 GMT (envelope-from git) Date: Wed, 6 Aug 2025 21:26:56 GMT Message-Id: <202508062126.576LQu5M011109@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 7556b55f0d67 - main - time: Handle kern_clock_gettime() failures in kern_clock_nanosleep() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7556b55f0d67b7fc353ca509dee120dac18fc061 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7556b55f0d67b7fc353ca509dee120dac18fc061 commit 7556b55f0d67b7fc353ca509dee120dac18fc061 Author: Mark Johnston AuthorDate: 2025-08-05 16:15:16 +0000 Commit: Mark Johnston CommitDate: 2025-08-06 21:24:36 +0000 time: Handle kern_clock_gettime() failures in kern_clock_nanosleep() kern_clock_gettime(CLOCK_TAI) can fail with EINVAL. Reported by: syzbot+e17e46b1f0b65027b005@syzkaller.appspotmail.com Reviewed by: imp, kib Fixes: 7b7ba7857ce8 ("Implement CLOCK_TAI") Differential Revision: https://reviews.freebsd.org/D51744 --- sys/kern/kern_time.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c index 9830e5093a3a..2a6f0989f6aa 100644 --- a/sys/kern/kern_time.c +++ b/sys/kern/kern_time.c @@ -571,7 +571,10 @@ kern_clock_nanosleep(struct thread *td, clockid_t clock_id, int flags, td->td_rtcgen = atomic_load_acq_int(&rtc_generation); error = kern_clock_gettime(td, clock_id, &now); - KASSERT(error == 0, ("kern_clock_gettime: %d", error)); + if (error != 0) { + td->td_rtcgen = 0; + return (error); + } timespecsub(&ts, &now, &ts); } if (ts.tv_sec < 0 || (ts.tv_sec == 0 && ts.tv_nsec == 0)) {