From nobody Fri Nov 13 17:16:39 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 4jR3nz4NrYz70wXq for ; Fri, 13 Nov 2026 17:16:39 +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 4jR3nz2CBrz3QMS for ; Fri, 13 Nov 2026 17:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794590199; 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=F2KHHosB31ertVyj4nGinG6RSeTGD1A90HOZIcfvUPc=; b=JCeezhvT0Nw29DZPZ4pQ5gziM50Vz/XPhpcxcWglqRXGDQkMdMSOw0p2dra6PhCH3Xm1BL gunP4eEnBqs5L4ioz20V9n54HTH+j8ISOlvHyaC/PanpT/XTK25pSz08jZkuy3bbQCuvdk x3ybNkfoXUv68MJWBO1QD2H+Y+enWlUIoVW1E/OhDxPLT/CQi0VSXAxbw1/cnLCQeExKo/ VQKPlZRVZvynGZwb24FUUX6RrComjxyRNZGTWKIxHLxEICd/SHWEvqJYk5jy+fIN4KTc36 kj81KsNkIKt+6XcSpiQY2Njiw2Bz8S5VDzmiRb7S50lKQe9Fz0egRVS12ZHfxw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794590199; b=T6U9/jVJRCBQUozup9vWgi5BhEnlUfJSct3n8KUz+sRGJX2YIqt4YKRiuHauuzl5lsHbBM jIGdBV4p017+HriyvuQVFP6VmZGkU6dJHxBOm2LYNExtCi5UcowNqJhAzfekTmtVgbqYYJ OD09D8x9AnGJ3bilVRdvsjhb+jGkiUF9i0Nu8wDrPiDgd0jmdPBjRBfDW64fFqSr2/N+8S eec38+IGexpVR3v/8soow6uPmgLx1GnWjbLiWtzWk2bwjadiqiJh14BVey/LWMx8dT0twj ZW0SJinkmUewMylzfb10Zsnotws1nRXHIDD0OvS3j3naCIgJsD55hWr9sJ9Ubw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794590199; 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=F2KHHosB31ertVyj4nGinG6RSeTGD1A90HOZIcfvUPc=; b=xCAi/D5DggVWTY2FXBqO0CvfEXA75Rn6BvXgX5DJThG20blYi6fgG0UhEMtYECGAKJ1hV0 dBWYaJR7j05nP7Zm5QRTKP4CO09qh+M+bDZnbIUPEixfFZE1ZSPdk9Nh8wRdWXCVsf+PUA fOZ0NntzvTX6kBHcrkyETgm3A/h1nspjnMEXrvc4AQ6WDOQxdb6NJgzGAaNMoSfuZx3oj6 ki0IQRARRnVFD1aKMvA/Zztg4Cum+n/whKmwg9DEG1RejMMsNgb2KL+r8JUQzU4i2aMCPV gWaVNKXBa8WpAtybJeWAKIlmtBFu5ms1lgXGrSD3TCLXCWIsZ2j4fmyOdrAe3w== 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 4jR3nz1cL9zkrd for ; Fri, 13 Nov 2026 17:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 16b08 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 17:16:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 503ecf5bf454 - main - if_geneve: Read the outer IP header from the start of the packet 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: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 503ecf5bf454a7d716111365471e879560e870c7 Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 17:16:39 +0000 Message-Id: <6af745f7.16b08.39ea3be6@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=503ecf5bf454a7d716111365471e879560e870c7 commit 503ecf5bf454a7d716111365471e879560e870c7 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-11-13 13:51:43 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-11-13 17:15:47 +0000 if_geneve: Read the outer IP header from the start of the packet The offset passed to geneve_udp_input() points at the UDP header, which for IPv6 comes after any extension headers. The outer header is always at the start of the mbuf. Reported by: llm-postcr Fixes: e44d2e941e8e ("if_geneve: Add Support for Geneve (RFC8926)") --- sys/net/if_geneve.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if_geneve.c b/sys/net/if_geneve.c index e13075ec583d..f08c0f5e1ebf 100644 --- a/sys/net/if_geneve.c +++ b/sys/net/if_geneve.c @@ -2983,11 +2983,11 @@ geneve_udp_input(struct mbuf *m, int offset, struct inpcb *inpcb, memset(&info, 0, sizeof(info)); info.ethertype = geneve_get_ethertype(m); if (info.ethertype == ETHERTYPE_IP) { - iphdr = mtodo(m, offset - sizeof(struct ip)); + iphdr = mtod(m, struct ip *); info.ecn = (iphdr->ip_tos & IPTOS_ECN_MASK); info.ttl = iphdr->ip_ttl; } else if (info.ethertype == ETHERTYPE_IPV6) { - ip6hdr = mtodo(m, offset - sizeof(struct ip6_hdr)); + ip6hdr = mtod(m, struct ip6_hdr *); info.ecn = IPV6_ECN(ip6hdr); info.ttl = ip6hdr->ip6_hlim; }