From nobody Fri Nov 21 04:02:59 2025 X-Original-To: dev-commits-ports-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 4dCM4z1Lyvz6GSL2 for ; Fri, 21 Nov 2025 04:02:59 +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 4dCM4z0YZBz3XwS for ; Fri, 21 Nov 2025 04:02:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763697779; 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=greFQH0xpk4EuCtIbaWr53RotSRxnBWLZ+x1abSV13Y=; b=Kuf7Qp7jz51r248WkajzdOQoCBcUXo3RZykaTEDfMiO1GFSK8DsqrwLfHMwaFW2pJ/na7S EVVhTIy64k+2ANt03i+I3wlG1GiODzp+vNpGkYQJMdWinfl04SoJ38SNH8frHeevqUBl04 XFTUjxK5JTQH2picgjze6XmpCyxsyT1Ugmk6djZop67SRV7V5Mo7xDBdZzgpIs1Ercl5+H 1PKxQEeGLg5cl1fQebJWRrUY7fG6oRT1NMPr1eqOqiIp2Sk0grsGoSp5DigO41Ir+I56fC jDj7Tlwfi2TwRhEVkRPbpzM2qpG83qRMRw/AoyQ+aCTmoSwHO4q6Q5gO7VVrwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763697779; 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=greFQH0xpk4EuCtIbaWr53RotSRxnBWLZ+x1abSV13Y=; b=WceBiulbVY1AeOMdlSDNvidLGdWojSwhRUO5yqNoZhHodW+z33ZZ5TuZJAplX4wOtbnVXH S0CIet0dA7EwJlOByRi9gYO33Ttc1Bz1ilVtHoXNuhPoVsxxMtlv5+0q7z3sqhOKoxrLff aoYzGJhw33I9AK4EvndEwOuWRstMyRoLeS0vDNYOrNlaGJRHIv0XqSEwAKO312FRfDmHRX G++SA4v9DefAiyLHadOneRedlfLtUJT0AyIri6VQQd4ra9emsIK438bT4DGFhC6z8lZMdU Z173W7Qg3B4XNHSeeQOdqN4tn+0PBbqmyNAvnMAQD69TFz7+6K//djY9hBXDLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763697779; a=rsa-sha256; cv=none; b=eS9nHiNvRiV7ZJv2eWTZ0oC+n2D+O90rA08kQp8yW6GeST+gglR1jB13Ogcx10fNDolDAo e1TTjfYYS0W3290oeSSyiqcJmpjFaR60rfqvlTtCcWZI+MNsLYYSFGlK1dKnAmctv/hyj3 7IqX+LU9+EPQt0IKTskz4p4RTetSCj+BwdFjgFQ9q+kN/5HApz5A46EDhzZ3bH9hhKFDUZ twGEb4gUbaKPxbu4lToDXgYcpBdIrP+H1HT3QrYViOQcenNU6QznOLWhMTS5hKPdB5kJHi 9vEQNj2IpLTvz5tSKsdqmT7dFSlRyWQ3EFt9Mazv0Gr5Kkeb5110FZNG/n213g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCM4z05YgzwCR for ; Fri, 21 Nov 2025 04:02:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34f79 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 04:02:59 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: f340e3ff6c03 - main - net/ntp: Fix two segfaults List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f340e3ff6c03de60564134af4f954d11888bd436 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 04:02:59 +0000 Message-Id: <691fe473.34f79.606f76fa@gitrepo.freebsd.org> The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=f340e3ff6c03de60564134af4f954d11888bd436 commit f340e3ff6c03de60564134af4f954d11888bd436 Author: Cy Schubert AuthorDate: 2025-11-21 04:00:47 +0000 Commit: Cy Schubert CommitDate: 2025-11-21 04:00:47 +0000 net/ntp: Fix two segfaults Pull in src/628715fdcc9f and src/ac1f48b4a7be fixing two NULL pointer derefs. Obtained from: src/628715fdcc9f and src/ac1f48b4a7be MFH: 2025Q4 --- net/ntp/Makefile | 2 +- net/ntp/files/patch-ntpd_ntp__io.c | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/net/ntp/Makefile b/net/ntp/Makefile index 2de4909c1769..4f858447eca4 100644 --- a/net/ntp/Makefile +++ b/net/ntp/Makefile @@ -1,6 +1,6 @@ PORTNAME= ntp PORTVERSION= 4.2.8p18 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \ http://archive.ntp.org/ntp4/ntp-4.2/ diff --git a/net/ntp/files/patch-ntpd_ntp__io.c b/net/ntp/files/patch-ntpd_ntp__io.c index 10bac6d961f7..d43d090049ec 100644 --- a/net/ntp/files/patch-ntpd_ntp__io.c +++ b/net/ntp/files/patch-ntpd_ntp__io.c @@ -1,5 +1,5 @@ --- ntpd/ntp_io.c.orig 2024-05-07 04:21:17.000000000 -0700 -+++ ntpd/ntp_io.c 2025-02-18 19:38:16.412031000 -0800 ++++ ntpd/ntp_io.c 2025-11-20 19:55:01.228924000 -0800 @@ -1486,9 +1486,7 @@ if (IS_IPV6(psau)) { @@ -11,6 +11,20 @@ return TRUE; } } else if (IS_IPV4(psau)) { +@@ -1921,11 +1919,11 @@ + } + else { + DPRINT_INTERFACE(3, +- (ep, "updating ", " new - FAILED")); ++ (ep2, "updating ", " new - FAILED")); + + msyslog(LOG_ERR, + "cannot bind address %s", +- stoa(&ep->sin)); ++ stoa(&ep2->sin)); + } + free(ep2); + } @@ -3205,7 +3203,7 @@ }