From nobody Tue Aug 25 16:01:07 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 4hTsvl5VDGz6pbsb for ; Tue, 25 Aug 2026 16:01:07 +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 4hTsvl369gz446f for ; Tue, 25 Aug 2026 16:01:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787673667; 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=zF09USsTJD1JVzFyeIfl7+DpsZQVSI5t+W61GTbHEyI=; b=aDEQNlkKWa+1klGoYa4Z8rpPs2AAJx3/TMoEtOMsnsCQwR5qi/Sbq6fXpz23GaM66e/Lop pD6LR1v1MHXQqNwd9HBzFYov8hpvPzhzyJmJGS982tINcOy7sLssRbCUsMhiKbWrpT9rAg uJqrm+ffJMR989uMBROpndzX7pL/tOfCBjiHPU10IhQig29K0kq7lE2s4zC4C868lKDSD+ CfwSi2FljastkosFWqHB0A8Cyg26J7DIQsoJa6tr0hHGgna4ynNI6bEXHd1m5F+dARzfuu W4yiisTz+7VZEN8Rilb8+Ivm6kTso3k1BjQpXOH0iEp9K378LhidJzepT3QuHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787673667; a=rsa-sha256; cv=none; b=yYj4JMj2or6Xk6LnRv2IeQjnY1QB+9j9IzT4ylgvlyeOoer+2h5/LP5LFnDr3E4+dk5XWz zy4DCEaZmXII0OZ+5gt7WCAbkHO48WVHUG5jYgeHBraTvqlpKISRGOl2baeqc9yAt6viCH X/P6ej3Hzum3DU3piLNt6/C0dthl4+QM/QjVrqXlk2B6S3xo/D6Vg7ezc6pcDDEaFibLCH IZ3lg4GSbtZ8NM66oXRAleHuPyk06Qv/HtWRL+Zw0/jFM3JxaHut9vv13GA0cNrhDYw+dB VPb64WTmoJhvte07Ip6Hu9o8a2RA26S0Wdb/NPxkHbpva7oxDsAC4RWC2r4DHA== 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=1787673667; 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=zF09USsTJD1JVzFyeIfl7+DpsZQVSI5t+W61GTbHEyI=; b=xOIAWu9i152t1keTJ8Q+GmhyHfNPJiIf2NzfE5ha6/gmQZP3ex2pDMdRJRCZgbYmTAFni/ 46Eq7OLQKtCArRFnmTc7RQWA49yP1+u6yLTdhvxZCmqBBBAkKdTE41wvcOZpKjaGSJqb6X Q6D96mUoPZWpMUqMzckj49P+ZACMyDyVSiU038qfm9Oi7Za46GIR4BGzFTbWkMRKs1rYSP cs5bsBL4iWpyXHJpXlTxTAZr+Z7ocZxkqGIkNv4KgUzaVmYaBQVj+A34xi7TaWmAIHyjtr jvvbRomKY+ReWMR3zMIiWvnBPFo2reO3j2QVkzy9Xmozz7xwaRtOTpgXadrc8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTsvl244JzxsN for ; Tue, 25 Aug 2026 16:01:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32649 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Aug 2026 16:01:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4ad6d3b4ccb3 - releng/15.0 - 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.0 X-Git-Reftype: branch X-Git-Commit: 4ad6d3b4ccb3e22acc1e53f41aaf05b476755e4a Auto-Submitted: auto-generated Date: Tue, 25 Aug 2026 16:01:07 +0000 Message-Id: <6a8dbc43.32649.3befa56a@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4ad6d3b4ccb3e22acc1e53f41aaf05b476755e4a commit 4ad6d3b4ccb3e22acc1e53f41aaf05b476755e4a Author: Mark Johnston AuthorDate: 2026-08-24 14:46:28 +0000 Commit: Mark Johnston CommitDate: 2026-08-24 21:51:22 +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;