From nobody Tue Nov 17 17:36:10 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 4jTX2f50klz71WqM for ; Tue, 17 Nov 2026 17:36:10 +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 4jTX2f3k6Gz4M8Y for ; Tue, 17 Nov 2026 17:36:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794936970; 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=DYTx72+dXgN7uFFmuTqQXPFcHXmuP2+HbA/HaDgGQnE=; b=foE7soepz3x+4BplA5fvl+5+Frn29ziXuq6e/mnV70T4AKlwGVEur5hygaemr3QkPEBVQL YrydCyJ/avCVL6qcz5rX623a4uHIA9YKInNnHAetVCXwHNmIMO8lIQCUNeA2GjTvNuK6Vx qlRo5mhOzh6mCc92Th4e4BrC51D8dPkjkC7ygYIQ4b4IFqjJV4kP5lI+ukBwN55daA8nj5 +ygTDMsmZwI8N97qFCfDC9Pj/EkGF+ltsvg07xBdQdHDLqIvt1jjoV/0ZkdfmrR90dfl8w CxcK+rn4mRjYS0DqzUM8PlZE5PNa8XbTiRWFsIlkJOejW5L7gnYumN1x0NDAww== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794936970; b=W/0qGIxuKVSZuEtc4b3keWlvVfEMgZLSO40+fPbAPoauRxVmzyFBGC7jGRDqo2xN/baUES 6VaXSiPUNPPim0uHjSSB0rTwz0TROeb410k6Q+5PX9V+cqRIOOXKmPP45lSfFjnaqE+YEk rSA7rFQAscYF6Wj6PQ2dNnyQIJaynorhGdi9Xr4dKGzC4/ov54+ZQ8+qE1xzpHqT821WOo H6Y67t+BHZMZxEPmylZDJGHjwJBWp8tYj8r9bp6nsRax93ygi2FBm/QGgL+B8pfmgDeyTx jhk7hpMCRhQ9sIOH2kZ/CTEZEaVF9nVMfL8K+eVva1y21UFud+lzwBKnTrQVVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794936970; 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=DYTx72+dXgN7uFFmuTqQXPFcHXmuP2+HbA/HaDgGQnE=; b=wSY2AAYwEU39X012XNEdoVnYowc4bquBruzIdbG9LODZXKQREw5lCJy1G+G7r1Pzhltvvd jdbz13e/FIypZRVxPpAoEtoc6uovl/fHlpZ+tqYhL1I3OoFO/J5yzELY2RFMfRNpXyCV+0 kTLR3vYezQWN5518QD6NbmSweORY0SOeb3Szqj2lLXnemtMKAmJpufaUXKiFVZgFzwlKNf BmiF8q9hbSoVeG1HihXhBLbo4bxGem3+9m7S1/Tr1FOnFT8JRegAPeUoZ3pL6pd1mlmF1f uWBWdvwFwXXIdgcmoE81dy6u3VWGapu9MPdB8B20W+yW9HpIFZKFlDRt1OS4sQ== 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 4jTX2f2m2PzscR for ; Tue, 17 Nov 2026 17:36:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3798 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:36:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: c1914b1be9ed - main - ipsec: Reject an AH IPv4 option that runs past the header 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: olivier X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1914b1be9edcd4e9b76c42f445d116c946b61f1 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:36:10 +0000 Message-Id: <6afc908a.3798.45c97434@gitrepo.freebsd.org> The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=c1914b1be9edcd4e9b76c42f445d116c946b61f1 commit c1914b1be9edcd4e9b76c42f445d116c946b61f1 Author: Olivier Cochard AuthorDate: 2026-11-02 23:02:58 +0000 Commit: Olivier Cochard CommitDate: 2026-11-17 17:31:20 +0000 ipsec: Reject an AH IPv4 option that runs past the header ah_massage_headers() zeroed each mutable IPv4 option before checking its length fit the header, so an option length byte could write up to 255 zero bytes past the IP header (and the mbuf) when ip_dooptions() had not validated the options (process_options=0). With the check done up front, the post-switch off > skip test is dead; remove it. Reviewed by: markj, rcm Approved by: markj, rcm Sponsored by: Netflix Fixes: b12a7532e390 ("Merge revision 1.35 from NetBSD: fix pointer/offset mistakes in handling of IPv4 options") Differential Revision: https://ron-dev.freebsd.org/FreeBSD/src/pulls/94 --- sys/netipsec/xform_ah.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/netipsec/xform_ah.c b/sys/netipsec/xform_ah.c index 5ccf1aebcaf7..832554b0f514 100644 --- a/sys/netipsec/xform_ah.c +++ b/sys/netipsec/xform_ah.c @@ -314,6 +314,15 @@ ah_massage_headers(struct mbuf **m0, int proto, int skip, int alg, int out) return EINVAL; } + /* An option must not run past the header. */ + if (ptr[off] != IPOPT_EOL && ptr[off] != IPOPT_NOP && + off + ptr[off + 1] > skip) { + DPRINTF(("%s: malformed IPv4 options header\n", + __func__)); + m_freem(m); + return EINVAL; + } + switch (ptr[off]) { case IPOPT_EOL: off = skip; /* End the loop. */ @@ -384,15 +393,6 @@ ah_massage_headers(struct mbuf **m0, int proto, int skip, int alg, int out) off += count; break; } - - /* Sanity check. */ - if (off > skip) { - DPRINTF(("%s: malformed IPv4 options header\n", - __func__)); - - m_freem(m); - return EINVAL; - } } break;