From nobody Mon Aug 24 14:56:45 2026 X-Original-To: dev-commits-src-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 4hTDWx2xSLz6pVLS for ; Mon, 24 Aug 2026 14:56:45 +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 4hTDWx20phz3n1D for ; Mon, 24 Aug 2026 14:56:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787583405; 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=LXmOkqYmc41nCmP95vlfoRXvOBkEYdY4M2kVU3QSXDw=; b=WVORA1vWdC2KLKdC2IYFHUFFll4/oAQxwUWqPsAHp9IzxSaHWau9f2E4gbindblNgbaNg5 IHpsCp18FdOTU6N4A/Vm1bljoxoUMqvcbD4GJz3kp63+o3rE3DX6VVFDAsKNphd3R7EsMt OeUlCMOb3oczJVb/a+JBZMhVVda6czxhDfgJmYMwFvNus8XiSxS7EDXf+BEpw2hfo6Hjwn bFW5LlakUkuI9NWKiwo6OJweB9IfKUG9em9jWcpwQppwa12RoxMW9Y3xFHRq7V2xnYwA3M Jz6/xOHNjINWpY5Oq3M0nvoMS0xuB/fasdtdemGvTPBsRN5KhRXtlakw1YjH6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787583405; a=rsa-sha256; cv=none; b=Ztyv+tBe5RrtfC7dHJWAPrlOE9BNXUPag+6HU+NMZn+fZmrFnzfJ/IG0P4QhrQBUz9hdx4 kTeg7RKB+cCOFzIQyXZp6zqLdaDT79nZIJjReWk6QghiGJF+guVYvyIDayTFHMahQlblH+ iC94rP+vkNYKUmxau6munEW947dBq5VtsxVy9qGjzMWjIQS/FhCZiHUDTEV1YcQYaTRnf1 JNlfADxiBw76CulrR0+Ji2CdAlB4OShxPP72/Md+nlZcwpRbxsV4dTcOpl+uNNG9owRts3 k5fG57MrLjeP2bYNII8zlATMdbXSw7GJQjdQ5Xh3LHHc6oF+BGUlT3IEdPlE2A== 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=1787583405; 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=LXmOkqYmc41nCmP95vlfoRXvOBkEYdY4M2kVU3QSXDw=; b=jAzKH//c7ryiKZpPpZhF999zPS0OdoTZksuJTyap28cHiWW59tZbs3R0Pm46lLA+z992pW 9rp04Fy6OM8TvWoGtEQ3nr5w7D/4oV6cENMI3Fkx+vva1PJ7ANEaeW8MV2s9sJJWEp3uhA Tsl6CWThLIjWnbHSngNMT7vYbAFeNnMn1whIqLm/HhaYuYyetpv0hUnvLZXAvmLy16F2zM cqXXzbmCf0ZKUmQvhKBiQlqVqI3FyECkhzanZSiD8q+aibD49ySHiR5Hmj2dtEsn06dV7W rTh3XhvFNY9eZNz0aboXZ+CVO/BKf5vGzipp+qmucCrwWGunV2lV98shPT6wcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTDWx10lNz18L3 for ; Mon, 24 Aug 2026 14:56:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47c7b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Aug 2026 14:56:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 6cb7e368daab - main - ppp: Fix a buffer overflow in the endpoint discriminator set command List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 6cb7e368daab6f166b7c8e26367ea6fee4cdd03a Auto-Submitted: auto-generated Date: Mon, 24 Aug 2026 14:56:45 +0000 Message-Id: <6a8c5bad.47c7b.1923eba0@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6cb7e368daab6f166b7c8e26367ea6fee4cdd03a commit 6cb7e368daab6f166b7c8e26367ea6fee4cdd03a Author: Mark Johnston AuthorDate: 2026-08-24 14:46:28 +0000 Commit: Mark Johnston CommitDate: 2026-08-24 14:56:38 +0000 ppp: Fix a buffer overflow in the endpoint discriminator set command Reported by: Reo Shiseki MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59054 --- 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;