From nobody Mon Aug 24 18:47:44 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 4hTKfS5cdnz6pkwv for ; Mon, 24 Aug 2026 18:47:44 +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 4hTKfS4tmBz3WXG for ; Mon, 24 Aug 2026 18:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787597264; 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=Hnj8hwqmUvClNkuOYwWmqulXBm8PHQBPNUq2GSmOoHk=; b=XIenh06zZFz0S/GHk5bUq5rLgS5CPLL5mEPvfbRtQJwgupXlmuNr1yqMo8Nx5vqZmnarkO 1QDreBG/uFNvhYqrPNRzmGnUU0SjPzxokztaRoL97xRkO5om6eJ2FfQGryFtNueCyp9X7o Zd0991CDtgTQH7ZlTq4qCQYu6i+W48JEv/NWinjGy3GJAxOicV5lwQDSQ4Y/KmrjJnI9dr YPzIOaEBKLUt64saOlrpy0eayruHGrxjgrT3udY7KNx7lx6rsJnwsRlMvYGcn4GWjiHmAq N3ENxbl1X/ueYrt5q+mW3ReJspzidseybn/wRD7A7s24z8fQDXq0aYnfAJxb9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787597264; a=rsa-sha256; cv=none; b=VxF8C4wET2Cr3qOyplhtki5edOF4aA2kkXI310wT6z8JPPj9quL8bsRSQVKdmyKHRdng9H Nm7xDkbrtJD6Y8j9TOZgTHo6hEEvlnVMr82jyLAO/qv37YlfNk6tm2GrdBhk8ZIFGRFs6U AAVRu2pGFqKygQ0d7Mq+BEhw4xx5sZsmyHKTDRhBSSl6WFNxBt96QMjfzrd/KRi2bLJfpo o2QwDEiax6M7oBrdxf/LBr3fuqyxeeUNBDYWVfjXSf41pB1mgyyf18KoOCZB1jr9asU/pn ONDJNOQkYle2RUdHxC+hXIch4PTe+krIUwt39ZTkQgGO92pIGLcmGvOX1pLteQ== 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=1787597264; 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=Hnj8hwqmUvClNkuOYwWmqulXBm8PHQBPNUq2GSmOoHk=; b=Bdz/UksnoltdaARQn5PHMH9V84LuIZniD2fZkYPXaRZMWbHg1CXkq3E/q0UNuk/vwF9oZX mF0PR4fuMiUbEUMR9Kk4n3x42NMJwILcfb+MKGDqxG2aneqJ7PWcknOy4v1ePh8jJJMhvO RXXoAci4vDZlNzhqT9UqIIBj48QG18d6WpER2BwIYm39TyQUbxcMQdHUqnl9yH1fbdt+c4 vDKL3zatLElKXL1PHoAP+nvg5TmXjnOLmv5k7o/TOJqHdkUtLsAx5blZAPDp90njIXoJI9 JPDRgEi748ebb030a/my9B6TQ+WyPiB8g6ERzM3wRx23Pe5roz871+5ncR5h9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTKfS3fspz1Zv for ; Mon, 24 Aug 2026 18:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 381df by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Aug 2026 18:47:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: dd2da2552346 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: dd2da25523462dc37db2c55dcb6a14ad6f1fed2b Auto-Submitted: auto-generated Date: Mon, 24 Aug 2026 18:47:44 +0000 Message-Id: <6a8c91d0.381df.ae7f8dc@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=dd2da25523462dc37db2c55dcb6a14ad6f1fed2b commit dd2da25523462dc37db2c55dcb6a14ad6f1fed2b Author: Mark Johnston AuthorDate: 2026-08-24 14:46:28 +0000 Commit: Mark Johnston CommitDate: 2026-08-24 18:47:31 +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 (cherry picked from commit 6cb7e368daab6f166b7c8e26367ea6fee4cdd03a) --- 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;