From nobody Tue Aug 25 16:00:39 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 4hTsvD1lfXz6pbW0 for ; Tue, 25 Aug 2026 16:00:40 +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 4hTsvC70lXz43Nl for ; Tue, 25 Aug 2026 16:00:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787673640; 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=MlZ4VpUJ45u+in6KDvMWZr4BlSy5Ig78Y2EiMnNOK9Y=; b=Xcwmef8Mz1nWtHDtic00RW4wxLypwiMdIt27qMHby8LUn9sU9d3q/eNabgIc/FnXdnm8yZ 9OX6PJ/KCd0qxjM1ZMrF/CkSGYqbLn00U+S6NAgyapl1A7CkNrWXERD8WzSm9J2d9hdbNA 9RFNjYr1NTWomjyHj5/HRdaR9dGuRV+9jeSgspAA/gliyhMELWj+rPpW3u8jZuZp3G1Sz4 oDxQJLAaD3Dxq5yURQnxEBetL1zefzMYO25yIh+kkJS265Y3APec8xP2QbECWChDZzkZzK QvFVj4mdAwQKZ4XglKs/Tt9nwUbl/r26NQd10HYFEe4V4IJqtGBEjKeIw97Gjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787673640; a=rsa-sha256; cv=none; b=rLy+qnvzXjndUCpExglMhJXZ7tL+zys/6f/VQJoMcphrM/jQv6LRmKTQrFVb4tVNj7Ugpk QfATLUat0X+okbt84ceSAqmXRe85biZuRyqOLt9vx2WZgUG/UgLW9Kdt/Hs28ESSPrTjYW NSTh0Fl70AES+VBczzNa3llVOpO2gbOPe04fkaSOagP3VBDd0Zu3708k3iLmmFBRFIwHVm v7TOZZQGnyrZobogMIyLs+nuvEE7zFkvU759uUt81JvNRxpt6zRsl4s+19Hh9WJRIc/PRJ KEZFT0bz/4GBMdWCsUqN+fIt3E1ZC+J3+dcP3lXzUeHpadhsxcx9PjqXAS3BzA== 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=1787673640; 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=MlZ4VpUJ45u+in6KDvMWZr4BlSy5Ig78Y2EiMnNOK9Y=; b=ILmaUYt0Ju/MxJGYssPoCTMZir0FtNxa5Gpnpg9A7Ta0uGF6bNiRQ2O161rlh/hKn49wq5 D5so4Ee59s2IbHNHhyflvoEodAX6zekKWNqDDMPhzlgah07ub7kako/QtTdmAv7G1121Bu zcu9k80kVB0/2UcE8wI+V86mFej8ikITIKalvPpx9S5AiasU36V3/uTdyi50n8GDoUObvv GWrJ6waPW9XuoXT7qdOM94+LFIeyDdEy6ASN883kXbdURvBUCBjRQMjFerd8bBxdvflkhP jJjHoG5JO307in4JJM34uuHCuGY8D1fUD11D+oD5kKLLK98W+ox/46sd34A9Ag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTsvC5mVzzxsB for ; Tue, 25 Aug 2026 16:00:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33119 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Aug 2026 16:00:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c086ed0cc5d6 - releng/14.5 - 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/14.5 X-Git-Reftype: branch X-Git-Commit: c086ed0cc5d6c68818aa9ca26fee31da2d8dbf21 Auto-Submitted: auto-generated Date: Tue, 25 Aug 2026 16:00:39 +0000 Message-Id: <6a8dbc27.33119.fdd487d@gitrepo.freebsd.org> The branch releng/14.5 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c086ed0cc5d6c68818aa9ca26fee31da2d8dbf21 commit c086ed0cc5d6c68818aa9ca26fee31da2d8dbf21 Author: Mark Johnston AuthorDate: 2026-08-24 14:46:28 +0000 Commit: Mark Johnston CommitDate: 2026-08-24 19:03:48 +0000 ppp: Fix a buffer overflow in the endpoint discriminator set command Approved by: re (cperciva) 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;