git: dfdc0cfda058 - main - ppp: bound IPCP IP-Address replies to the reply buffers

From: Nick Price <nprice_at_FreeBSD.org>
Date: Wed, 11 Nov 2026 02:28:00 UTC
The branch main has been updated by nprice:

URL: https://cgit.FreeBSD.org/src/commit/?id=dfdc0cfda058ea8ff8ed3ef1a7e249786627029f

commit dfdc0cfda058ea8ff8ed3ef1a7e249786627029f
Author:     Nick Price <nprice@FreeBSD.org>
AuthorDate: 2026-11-11 02:26:56 +0000
Commit:     Nick Price <nprice@FreeBSD.org>
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 <nprice@FreeBSD.org>
    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