From nobody Tue Sep 16 07:39:04 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 4cQv0m4C7tz68VP7; Tue, 16 Sep 2025 07:39:04 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQv0m3JzNz3cFN; Tue, 16 Sep 2025 07:39:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758008344; 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=7R3LsFnlCyrNUYTVSnpjU5vf9teRwx0sS0Vt1BHfSlY=; b=E1d9G20SkaOXyG3VqmJ71ahNwMJeDcPglV72VDCd+qr/p9SHXN6p8JZEmsxLEMAUNLfDeA TOld6Ufr8JryP7Bc5f7Znp72Jzb1CkLeJbfP3+T4vqyUi7DofD9JqtXmxbLpgwkTBjw+ve fHlNMGoHdFaEXG8KxuoN+JrAO7vgWrpWYMCbyvFKi6eozOHADCpgrhgMdMRONEcLsb46wu DHP4Tdh2tN3A2+0b3pRF9S/Q9Xmlen6QVdYy+a+Y8s8XVeCVSBr7rxGuVn/Ef5+UK8fGn8 wJn2m6LsGDMjd+dSQr70IYjHkgU9KFW6IfRITOLmyESclWA5o1pdUcDZyk0Wyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758008344; 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=7R3LsFnlCyrNUYTVSnpjU5vf9teRwx0sS0Vt1BHfSlY=; b=odeE+KSsIZ8f8Tvnz2DrC6+pJPoSFCNfCQZ99fnrIk6IMrMhroFYys7reQU+Fi+2Z1+Mrj 4t1LnouNWGckf9skTwGVRAsnn07PMAx/W8wM/RuSUjs9RKUlcSfb3U6jXyeL7aJDNqgP2z ISf5eCznLHgS+NXB0kmVlc5o61DENIDgDJXnMqjdKYE4FQJLbChr+ds1zY3SKxcg8CCkQv 4GErVNq4izCzvgbhB7P8/fQlDZ5aH8yGdNnIUjkIamlXOteWmjPgEBtBa5nzZaUAfptsVk i8JIJlZTaXjDLRYhKIsvgjB5y9IQPVEhFk/NP4MZykhQI/aQk41FNZAo5FD5mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758008344; a=rsa-sha256; cv=none; b=i48hmM2+w4srt7oEyCr87txsc2oSzRN9OkEWwDTDXhWxyQDEnQXCsNHSLhDRL5yLC2CnO+ T9CKr9fKMcd4jWjW4Lh9s9qMK+0M2DphAik2MuPnZe32K6tqU8AbHbMNm+y3LFjjaRHwje Al3UMRz3KO1pqAjrla6oUI10LmSW+fuR4CQM02vG+2yvFwXemNiK3Ub+Cw9XxxGy39PxKN bobGygDrcY+riLvF9w/x+/sXuB3ChAhUxnxSgF/VYG22iR7FeAgGTX/usAdA9FyKlL/cje qfl30f+AgnwLwzjVyg+B/W1k1z41WbCvKC7kyuBMpYcd64aodhNqXJ8VXyGtog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQv0m2jCPzXGq; Tue, 16 Sep 2025 07:39:04 +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 58G7d4C7047491; Tue, 16 Sep 2025 07:39:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58G7d4gr047488; Tue, 16 Sep 2025 07:39:04 GMT (envelope-from git) Date: Tue, 16 Sep 2025 07:39:04 GMT Message-Id: <202509160739.58G7d4gr047488@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 588a5fad3e8b - main - IPv6: fix off-by-one in pltime and vltime expiration checks 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: ae X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 588a5fad3e8b98955b60707e3e92b8b43566e3f7 Auto-Submitted: auto-generated The branch main has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=588a5fad3e8b98955b60707e3e92b8b43566e3f7 commit 588a5fad3e8b98955b60707e3e92b8b43566e3f7 Author: Andrey V. Elsukov AuthorDate: 2025-09-16 07:34:55 +0000 Commit: Andrey V. Elsukov CommitDate: 2025-09-16 07:34:55 +0000 IPv6: fix off-by-one in pltime and vltime expiration checks Previously, the macros used '>' instead of '>=' when comparing elapsed time against the preferred and valid lifetimes. This caused any deprecated address to become usable again for one extra second after receiving each Router Advertisement. In that short window, the address could be selected as a source for outgoing connections. Update the checks to use '>=' so that addresses are deprecated or invalid when their lifetime expires. PR: 289177 Reported by: Dmitry Nexus Reviewed by: zlei Submitted by: Marek Zarychta MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52323 --- sys/netinet6/in6.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h index 1ca846ebf514..67c3ccbb1be8 100644 --- a/sys/netinet6/in6.h +++ b/sys/netinet6/in6.h @@ -358,11 +358,11 @@ extern const struct in6_addr in6addr_linklocal_allv2routers; #define IFA6_IS_DEPRECATED(a) \ ((a)->ia6_lifetime.ia6t_pltime != ND6_INFINITE_LIFETIME && \ - (u_int32_t)((time_uptime - (a)->ia6_updatetime)) > \ + (u_int32_t)((time_uptime - (a)->ia6_updatetime)) >= \ (a)->ia6_lifetime.ia6t_pltime) #define IFA6_IS_INVALID(a) \ ((a)->ia6_lifetime.ia6t_vltime != ND6_INFINITE_LIFETIME && \ - (u_int32_t)((time_uptime - (a)->ia6_updatetime)) > \ + (u_int32_t)((time_uptime - (a)->ia6_updatetime)) >= \ (a)->ia6_lifetime.ia6t_vltime) #endif /* _KERNEL */