From nobody Tue Aug 25 16:00:28 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 4hTsv13QrFz6pbPr for ; Tue, 25 Aug 2026 16:00:29 +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 4hTsv06GN4z435B for ; Tue, 25 Aug 2026 16:00:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787673629; 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=iTGQjpFIxG2Jsdxft4pmHPSCYiKqTbBvCJcV8MJGF5w=; b=eQ+H9EJCILCl1zEmNqQR2+hmkt2a9/Ora0FofWNLpbEuvgHR7Vyab/gIqzK+mBXqOlcZNE 0qgoGeyBnserIF5yDXj8znOYcKnauwetB0ag6XEDb87ojQYJ+OFVaYuhrpiaWz/gpepEnm CJwItcRBELasloBKNYDd/fYkIP5qJgJLOUykwiWZqAepoacKhlUFVaPlaXuOnONRHmlMK+ Fgj6EVxW1E0GrxAmD2bOlPH3J0pZ3yIZqUPBWsEEnCTs5Cd5kOrsVWX+OemWHteK+Z+DRY sNx3huxnVkzQpls1PzOJliQ3vUiDT+zjFb1Zlh62XzLHw9dZDjWBE1gyQwnrPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787673629; a=rsa-sha256; cv=none; b=lZwVoJP9NApwMdur+PaAxVuhrzeMia5YNH17Tvp/c8MPBHBLyo0WaZiIEg74eS5sFedRIr 4OvQK7q/s9lKJu5eCQaUtGvg8gpX1XrF5Sd+Dobh09kSYq+EY+w0tTzwGYD64Aj5eIquxq oGoASAlZC7T2hRFO9vayjx+da3Wq1D7C5AAf2PcIV+mePWDPtJoY3ikBaz79pYX41vLkbK pQXcsgYJc/23Qq6tzJLGQCYmgMhVqw6RpwViUPBKbTxtuSjjjxA/lg4usNl2hGLl4p+eE1 iy7aeJerjI7mkBnCHRbfPcDagMGxxoppC7XjY29uSE2uam9RXwaUxVjc4v9KzA== 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=1787673629; 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=iTGQjpFIxG2Jsdxft4pmHPSCYiKqTbBvCJcV8MJGF5w=; b=kmvawUB4yF52RENlDUz7b2HJAgVged27Ab6cZfEe71nChAkjOaYCh6XYhuGCY4nKgb8WJv z8R5HdFvRhXjdZRFl1Z44oaPSR6vIp+YdwFhjh/KOz/lKT0RobZNCbiR6e2BPNQR5lMfF3 QOVAPU8k12mED2EYsFnRNWsHJpY5k2E0CBRurEUvrlOLN3oiBcuJIqm6bg/WUk1uFT3jJR A2Rsy+vSPEAfCRvkdyb2Jqsg0tuxJn+tFsQs2KF8WmWrJZaU42rki5v+iy1SY/nTf1w7ej F6GPhWgPLBHSxIqdGyPA6i0om6t4TtQ7efiZvxFY/J7dId4P1LNi46dmPWF5cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTsv04FYBzxW4 for ; Tue, 25 Aug 2026 16:00:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 321e0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Aug 2026 16:00:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8544e4ce677f - releng/14.4 - 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.4 X-Git-Reftype: branch X-Git-Commit: 8544e4ce677f7ba3e036f8206d5890e140549e9a Auto-Submitted: auto-generated Date: Tue, 25 Aug 2026 16:00:28 +0000 Message-Id: <6a8dbc1c.321e0.7802f057@gitrepo.freebsd.org> The branch releng/14.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8544e4ce677f7ba3e036f8206d5890e140549e9a commit 8544e4ce677f7ba3e036f8206d5890e140549e9a Author: Mark Johnston AuthorDate: 2026-08-24 14:46:28 +0000 Commit: Mark Johnston CommitDate: 2026-08-24 18:59:35 +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;