From nobody Wed Nov 11 02:28:00 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 4jPS9X63Dkz6y6k4 for ; Wed, 11 Nov 2026 02:28:00 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jPS9X2n70z3F1k for ; Wed, 11 Nov 2026 02:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794364080; 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=5nJ2Y3RB1K2H7ysu8fw/R7PVu80MvpnCR0CIQi5A06M=; b=USKKHFlnmfqE12O+cEALLYnBv2hekrnNeImfTdf+cJlGt1OHAmWo3byq5XInNDaq+3/6xH SFLggnnlcq0YQQKZfDKUgV+ce9qqRdKGOHw7ndykw7CfF5UBEJYqt5xBQrsYnspCjpgOL2 nHC8m6asui1+NQYfNlYyXKm6WM6f8qcBj8Qc7REYFSDgRgghim8I2Ke4+bXKiAryKU/UML 3TSjV2dq4loOYoE6g4v2HBtsNmSZjCK/kj8auU0ULC5Ss6E+Hd8JgJAMGEOSiHValfCm4o UKmNPhfPkQrT4BrUhJtX+t5kOtMME/qmPD9tJjN583h9zfKaQ3Eudu+R3/DIgA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794364080; b=xqORaOuM/pLAaPQzcPnqVjcXXKhj9c8FqIiNkO8wJIT2r0zrPsXhvDVkZEWI6Ea9a6/dW4 Q6CVf6JMgp1GblJmval8paIBcVvCezqCB0y+Oy61X7Lwh7FhMubfqAVyXE8Onm6x5ihXnz HAUgVBoOJYJFoAV2wXDd/THziJVN8GRMHqONfMKo+RfRAFEp+xbROZdv/IRpqzW0HEoO1c 9QXzze1RKEVqQfH4qBgqvtAxgizkuWQCsJR+BkzSoxNsKzKRT1HmIDDVbe6u3xVHxvE6oN Qtd3bYamJpb9w/2HJRbHKwP9QFIplb27QWRS5iKg8CID6ZnvimbgJvc4julabA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794364080; 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=5nJ2Y3RB1K2H7ysu8fw/R7PVu80MvpnCR0CIQi5A06M=; b=vqSGAvTHxyi8GMneHekkaEoib6AT5RaBeGb9x8OyMRCLhgk2r6hNcJFhjQp13Y2Bkxwg+h yQjMNmSI0mbxbVmceLcOZB8xr8cRnqozYv13xKE+qN6TB52hB266asDmPAwE4iPSQPkMG5 65ZJc2It1DA0gKuZCZ35XZwnucyC2CSzHWjTBw33WmVt00fhk0P/XTHjH6PYhdXQBR/jnf e6Sc+6Qiz3XGNlEb+TyDsdWKC8yTW8f+/Syj9oi9K5Wncbt9u4YGxJTPAMu8Mf4bPE46cu TfVAkdxvp5szAYD1MJbpuxHfECeF3PziNpl4drptXnb7fhDHxsSBbpLfyjX9tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jPS9X1tyYzw9P for ; Wed, 11 Nov 2026 02:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2b31 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Nov 2026 02:28:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Nick Price Subject: git: dfdc0cfda058 - main - ppp: bound IPCP IP-Address replies to the reply buffers List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: nprice X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dfdc0cfda058ea8ff8ed3ef1a7e249786627029f Auto-Submitted: auto-generated Date: Wed, 11 Nov 2026 02:28:00 +0000 Message-Id: <6af3d2b0.2b31.ce590f@gitrepo.freebsd.org> The branch main has been updated by nprice: URL: https://cgit.FreeBSD.org/src/commit/?id=dfdc0cfda058ea8ff8ed3ef1a7e249786627029f commit dfdc0cfda058ea8ff8ed3ef1a7e249786627029f Author: Nick Price AuthorDate: 2026-11-11 02:26:56 +0000 Commit: Nick Price CommitDate: 2026-11-11 02:27:04 +0000 ppp: bound IPCP IP-Address replies to the reply buffers `ipcp_ValidateReq()` appended `IP-Address ack/nak/reject` records to the fixed `fsm_decode` buffers without a bound check. A `Config-Request` with ~17 or more `IP-Address` options overran a buffer into its own end pointer, so later writes could go wherever the peer chose. Emit the option through `fsm_ack()/fsm_nak()/fsm_rej()` like the other options. Reviewed by: markj Approved by: adrian (mentor) Signed-off-by: Nick Price Differential Revision: https://reviews.freebsd.org/D61326 --- usr.sbin/ppp/ipcp.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/usr.sbin/ppp/ipcp.c b/usr.sbin/ppp/ipcp.c index 23f68ad0f7c6..7a3d1c38db3f 100644 --- a/usr.sbin/ppp/ipcp.c +++ b/usr.sbin/ppp/ipcp.c @@ -980,8 +980,12 @@ ipcp_ValidateReq(struct ipcp *ipcp, struct in_addr ip, struct fsm_decode *dec) struct bundle *bundle = ipcp->fsm.bundle; struct iface *iface = bundle->iface; struct in_addr myaddr, peer; + struct fsm_opt opt; unsigned n; + opt.hdr.id = TY_IPADDR; + opt.hdr.len = 6; + if (iplist_isvalid(&ipcp->cfg.peer_list)) { ncprange_getip4addr(&ipcp->cfg.my_range, &myaddr); if (ip.s_addr == INADDR_ANY || @@ -1009,15 +1013,11 @@ ipcp_ValidateReq(struct ipcp *ipcp, struct in_addr ip, struct fsm_decode *dec) } if (ipcp->peer_ip.s_addr == INADDR_ANY) { - *dec->rejend++ = TY_IPADDR; - *dec->rejend++ = 6; - memcpy(dec->rejend, &ip.s_addr, 4); - dec->rejend += 4; + memcpy(opt.data, &ip.s_addr, 4); + fsm_rej(dec, &opt); } else { - *dec->nakend++ = TY_IPADDR; - *dec->nakend++ = 6; - memcpy(dec->nakend, &ipcp->peer_ip.s_addr, 4); - dec->nakend += 4; + memcpy(opt.data, &ipcp->peer_ip.s_addr, 4); + fsm_nak(dec, &opt); } return; } @@ -1027,27 +1027,23 @@ ipcp_ValidateReq(struct ipcp *ipcp, struct in_addr ip, struct fsm_decode *dec) * If the destination address is not acceptable, NAK with what we * want to use. */ - *dec->nakend++ = TY_IPADDR; - *dec->nakend++ = 6; for (n = 0; n < iface->addrs; n++) if (ncprange_contains(&ipcp->cfg.peer_range, &iface->addr[n].peer)) { /* We prefer the already-configured address */ - ncpaddr_getip4addr(&iface->addr[n].peer, (u_int32_t *)dec->nakend); + ncpaddr_getip4addr(&iface->addr[n].peer, (u_int32_t *)opt.data); break; } if (n == iface->addrs) - memcpy(dec->nakend, &ipcp->peer_ip.s_addr, 4); + memcpy(opt.data, &ipcp->peer_ip.s_addr, 4); - dec->nakend += 4; + fsm_nak(dec, &opt); return; } ipcp->peer_ip = ip; - *dec->ackend++ = TY_IPADDR; - *dec->ackend++ = 6; - memcpy(dec->ackend, &ip.s_addr, 4); - dec->ackend += 4; + memcpy(opt.data, &ip.s_addr, 4); + fsm_ack(dec, &opt); } static void