From nobody Tue Aug 25 16:01:27 2026 X-Original-To: dev-commits-src-all@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 4hTsw81k5yz6pbrk for ; Tue, 25 Aug 2026 16:01:28 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hTsw75CZkz44WF for ; Tue, 25 Aug 2026 16:01:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787673687; 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=o8VVMGpYGGcEkKE/NBaJlyKMMIGCte/qinOMGW7K8WE=; b=W0PlES7CV8FqfdXl8h0YdzvFOuQKvaLsMLahFEzOcod2T1xx3XUMvEofBHxzZhq0ViLEJm PGTYQAhrrC++EBtiIA+FpfqVQD0qD08WEyn3UQ1lFR7+ojZlrI1eB9yDNrqE/1lye84vWN Uo5IyFBYFEc/qSehIPiQ6HLisEqkrD75WbpDOiv4RIy8+TJMzW3q8U322wOwa7vJD2sh5I ghQ5kkkdRaEoK73O85tbCIyJltNApiS7C10IvrbLCUn3jP6++DyrWm7BEj5loZHEDgONhf tNrQ7m9igmWqYinoJHY0rx84ZbylZK06dEfpiM1OnhV4D2DwD3sf9gNZxenDrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787673687; a=rsa-sha256; cv=none; b=er9PQU+LjYVRei90W6SZze7Sb+5zOsF9H3j/rh3xRiHnZvkVGOuyAaW3VHj5Ps6NRqBtn1 lLyzBxeaVsngCCXvs55yjVlFnx4a28O+IB5/XEG8yMjpTQoA5pcd4CAC8oBSXSR6O7mWxK LvG8a4Rba7DALJjCTkGKDkbrSP3V50VXS4Mu+Ri88vDFkdu9z0ICm4f8VXH/QzazB7LWY2 5Ff0mrDE1HFbf6L7uWlq3C/R3OU2PJq6kxbG6k5s9KcUGameLL205ASH/4EqEv1CWjdzpJ FSKPFPoj2OwIb8OBxNWHDypRCprb7BpMBJcXqgG6xD6yTYowszxiQdoj6EJfnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787673687; 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=o8VVMGpYGGcEkKE/NBaJlyKMMIGCte/qinOMGW7K8WE=; b=R+cBzAgqwlMsefe/iN6l46sNyJTbU1kQP+7aD6vz9e7Wonor+mFwXQ+/kgYSf2cBCoe9i8 KqHIKQSnA63xqhjy2GT5n3cmbbqPKdQWPNClXPFJaIqYHQ5wmH0/yGiw4Lh57mh1adx1Rt BlFg/u84MEXyYzM+OgJGKGEw3Pvxy1kEYP3CMaoez3qQP1Km4lvgEy1CKeie/H3XmqUGgk pULDw8hvJCqDLQlhi+bo/mTsGEr/5ZoDXaVE7r1Y9ClBoJx2Smy+AiUIqsRPQBIIYCWc5l RAPi+RcyAekTaYEOXKZsK0rshR8hNGfq1jXq7/N2igDwZQjptwcGNwgL+lV09w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTsw74Hg1zyBK for ; Tue, 25 Aug 2026 16:01:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 313eb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Aug 2026 16:01:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5c00c1e02276 - releng/15.1 - ppp: Fix a buffer overflow in the endpoint discriminator set command List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 5c00c1e0227693109a24692f39806782afce6860 Auto-Submitted: auto-generated Date: Tue, 25 Aug 2026 16:01:27 +0000 Message-Id: <6a8dbc57.313eb.516f5fdf@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5c00c1e0227693109a24692f39806782afce6860 commit 5c00c1e0227693109a24692f39806782afce6860 Author: Mark Johnston AuthorDate: 2026-08-24 14:46:28 +0000 Commit: Mark Johnston CommitDate: 2026-08-24 21:51:29 +0000 ppp: Fix a buffer overflow in the endpoint discriminator set command Approved by: so Security: FreeBSD-SA-26:60.ppp Security: CVE-2026-58097 Reported by: Reo Shiseki MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59054 (cherry picked from commit 6cb7e368daab6f166b7c8e26367ea6fee4cdd03a) (cherry picked from commit 55ee29bf351533644d35e82da87fd1661d879f04) --- usr.sbin/ppp/mp.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/usr.sbin/ppp/mp.c b/usr.sbin/ppp/mp.c index f5f9dd9ddece..d4055f33056f 100644 --- a/usr.sbin/ppp/mp.c +++ b/usr.sbin/ppp/mp.c @@ -1020,9 +1020,14 @@ mp_SetEnddisc(struct cmdargs const *arg) mp->cfg.enddisc.len = 20; } else if (!strcasecmp(arg->argv[arg->argn], "psn")) { if (arg->argc > arg->argn+1) { - mp->cfg.enddisc.class = ENDDISC_PSN; - strcpy(mp->cfg.enddisc.address, arg->argv[arg->argn+1]); - mp->cfg.enddisc.len = strlen(mp->cfg.enddisc.address); + if (strlcpy(mp->cfg.enddisc.address, arg->argv[arg->argn+1], + sizeof(mp->cfg.enddisc.address)) >= sizeof(mp->cfg.enddisc.address)) { + log_Printf(LogWARN, "PSN endpoint too long\n"); + return 7; + } else { + mp->cfg.enddisc.class = ENDDISC_PSN; + mp->cfg.enddisc.len = strlen(mp->cfg.enddisc.address); + } } else { log_Printf(LogWARN, "PSN endpoint requires additional data\n"); return 5;