From nobody Mon Sep 26 11:55:11 2022 X-Original-To: dev-commits-src-main@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 4Mbh5X2YQgz4V8HX; Mon, 26 Sep 2022 11:55:12 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mbh5X1t4Zz3fsD; Mon, 26 Sep 2022 11:55:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664193312; 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=rY8jHwung26XYZZS++dX2sStJxU0HygT1V2cdi6Qeog=; b=vDTr5zqNXDSTEpVFklMEmGKwc4Brvjtq6vucjrdwWcB+ILlnRLifdjNSFNVEAkbvPrLJXU aHGclZpikzJhzx6lCo6npsQpdLTw9ScJsPctTHqz/DiIVQCHeQJucpS01aronRx3RpzfFj bGsm0J31NSH78frHWAqoyKIjudxsosWxHljqiUGPX8T++nVwbZWHe0OP008bObXE/iNeOP oWZpgqDOf6YRZh4GEtUhfhF4dCG8CXi5aMYe+wIkqFeSkeP6Pzt9SCKA/uppTXIJRlDRNf 0++UqhhyFAA+Kip/DHUxxYjJ+6RneIX8ouI1CTw5AC/MODTVzOMA0sJ213E5CQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mbh5X0lYDzldD; Mon, 26 Sep 2022 11:55:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28QBtB9m070500; Mon, 26 Sep 2022 11:55:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28QBtB7E070499; Mon, 26 Sep 2022 11:55:11 GMT (envelope-from git) Date: Mon, 26 Sep 2022 11:55:11 GMT Message-Id: <202209261155.28QBtB7E070499@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 76e1c9c67104 - main - if_ovpn: fix address family check when traffic class bits are set List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76e1c9c671043e08bdd951ae6c768b541fdede19 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664193312; 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=rY8jHwung26XYZZS++dX2sStJxU0HygT1V2cdi6Qeog=; b=ACpLkehKZpsuDM8CHb+KQfyb6b2Ydx2W6IuboHcx1d2XlmN5gU5Tmn3JKiFyd0oTWloJRu +xNyBU4+V0hcRCXXL5aoVRyqkQZkF1rDn7DPrlGfqCj8kIXEtM/58mLgG7eg8/hhcFaj5V lZBLbWdn7mkcloXHAq5vbMqGqwynW5KdK7bST/cL+2sNOsthCVaAmhePe293BVM9XcDzsa ij52Oqq1fyTh62NLgMcMwX/39tlcuRk6rKjwSlfPve3swUX3La+k1kbOVLcqnN4KE7sUPo hYeu9SHJnSFiC01s+Z34Ih+gTvCx06tg8+yBN7QJbL2Cx5muDyo2B82Qd+HwOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664193312; a=rsa-sha256; cv=none; b=d3nKpa2BW2R47I9RyiNnbCxdxcSReoBoWPdHdCDPyn8FCDdj7mSUjfdDl4oqjxmuZHAP6j Md8HAXS83Ycv+I2SYH0WMWndYxaVjODLuDZt9gKM4yQGzoS89JsI5GSnWRBn+zwe2tyEAQ +r9tmIFfn7TEHZUV2QK3drQIQCfv7L1Jeiq2JQlvUpzx49B1Kjrn0cmOA1vma7ixdYKj8/ l6wuSdCqNoiwrdHCegUfNeEHIU8G6UjrjeFm72i56m5HwFuAiMxC6Y9PRnTEXiXC1nByP8 iQHxugzqtHb+KI22dRJebL1RZ4Zus8Us/BsxnY+UKfVTiG0a6LY8t4XMhDF7EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=76e1c9c671043e08bdd951ae6c768b541fdede19 commit 76e1c9c671043e08bdd951ae6c768b541fdede19 Author: Kristof Provost AuthorDate: 2022-09-26 09:58:51 +0000 Commit: Kristof Provost CommitDate: 2022-09-26 11:54:20 +0000 if_ovpn: fix address family check when traffic class bits are set When the tunneled (IPv6) traffic had traffic class bits set (but only >= 16) the packet got lost on the receive side. This happened because the address family check in ovpn_get_af() failed to mask correctly, so the version check didn't match, causing us to drop the packet. While here also extend the existing 6-in-6 test case to trigger this issue. PR: 266598 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/if_ovpn.c | 2 +- tests/sys/net/if_ovpn/if_ovpn.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index 286125fb42d5..ed0ff178972f 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -1572,7 +1572,7 @@ ovpn_get_af(struct mbuf *m) return (AF_INET); ip6 = mtod(m, struct ip6_hdr *); - if (ip6->ip6_vfc == IPV6_VERSION) + if ((ip6->ip6_vfc & IPV6_VERSION_MASK) == IPV6_VERSION) return (AF_INET6); return (0); diff --git a/tests/sys/net/if_ovpn/if_ovpn.sh b/tests/sys/net/if_ovpn/if_ovpn.sh index 024f2488c951..bc1d3a85c987 100644 --- a/tests/sys/net/if_ovpn/if_ovpn.sh +++ b/tests/sys/net/if_ovpn/if_ovpn.sh @@ -383,6 +383,7 @@ atf_test_case "6in6" "cleanup" sleep 10 atf_check -s exit:0 -o ignore jexec b ping6 -c 3 2001:db8:1::1 + atf_check -s exit:0 -o ignore jexec b ping6 -c 3 -z 16 2001:db8:1::1 } 6in6_cleanup()