From nobody Mon Aug 24 18:49:06 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 4hTKh258n6z6plLC for ; Mon, 24 Aug 2026 18:49:06 +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 4hTKh220Yqz3Wp4 for ; Mon, 24 Aug 2026 18:49:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787597346; 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=NkIBKHAC39gMrUefwbKl7ZNIcgzh8T8fEbbFkFJ/TR0=; b=FDpWVd+I0U/nCHFKkPolkva6YxP8qx/Z9lIvHIlaLRiPVcOqUKW4ZhJQwFZ1lODhRfI9wk wH/OuJszPlJVSxU3fMuc0iu9l7yQjrfC4r6ggeWP9qz2FvrcUblBGstfqD6qDbAvR30jC9 8aeEkVnq6hiV31AHPvmxMNSggmTzanheWOeus4gcdcEg2C/43TgvlZv5TZrfNlr4mB58vn YA9P8BZ+L4C6hrTmtVF+lr85+kLb8tuBXxxAfMaaxJI672GDNJ9fEbYLqmNOz15xqEKu2A HZMJpiiiNITPVjB0lzZTxIRpzJRThH39HLZYR2AlwY+dCaVsT60q+D4+gJOY0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787597346; a=rsa-sha256; cv=none; b=f0a9Br5lvTt2DIwaiB31eWUGXAg4sfZxdQG/1hV6GErUT0Kgy625RzRJzWGSzPJBqti99M yyKzmtzCF3smgGxZWMLY2w0F86Jw0cRc1LqwwC5iBCvAX4I1A8ugKtR7d0w4vNbJFXvQou bnKPntzms24q0xcZ4hKwI4sAmgBWHkvRfFr++6o3QpNmDcsLZYTVgEplGbqVBve0FzKfp9 XUdhF3lzhW6E/u72Sz0nEl5mzYCWseC2n9Pxyj5+MJ+URtoutKqHLb25GIJ+gueJsYWok2 eXdvP/7uy9kzo8JISoBntKtGexwqjJiE0LY0xlh3DG9DdYqdBfa7qqtEF/TMUQ== 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=1787597346; 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=NkIBKHAC39gMrUefwbKl7ZNIcgzh8T8fEbbFkFJ/TR0=; b=btRKclO8LLNULEqYXYhVGXnLU4PtNa1AgxFq+3bHTYZEArHqPl0jKxAwnZVGpzQ6vmmFlQ OmS1vra6V5WCMHQUv/Np6QW/eU4B0bat9rNrA6LSqhoESoWmlwE8niClPD+bh6XkIDq4Xm tdJwQoU/zhcraQP0ajUl/zvRwBHwGkJniwmx/Fzd/AkDdIug3iOk7K9RcQKrs1FgdJJlbl nRXe7uxemRvbE/nwaexRCm8RToa5/C3I0lBF1jBPF2YHmSgTeaXscQxwGJSWlEIfairkCR dIsk+yCHtE2E4EmAgwempLYBe6qZmFBK3z1hv8ePTupprjho5ZOIPA4zCa6ZeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTKh20yLsz2Gm for ; Mon, 24 Aug 2026 18:49:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3937a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Aug 2026 18:49:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 55ee29bf3515 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 55ee29bf351533644d35e82da87fd1661d879f04 Auto-Submitted: auto-generated Date: Mon, 24 Aug 2026 18:49:06 +0000 Message-Id: <6a8c9222.3937a.7dc2c17a@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=55ee29bf351533644d35e82da87fd1661d879f04 commit 55ee29bf351533644d35e82da87fd1661d879f04 Author: Mark Johnston AuthorDate: 2026-08-24 14:46:28 +0000 Commit: Mark Johnston CommitDate: 2026-08-24 18:48:33 +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;