From nobody Tue Apr 18 07:23:31 2023 X-Original-To: dev-commits-src-branches@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 4Q0wPv6Jb2z45tq8; Tue, 18 Apr 2023 07:23:31 +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 4Q0wPv5Fczz3ncW; Tue, 18 Apr 2023 07:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681802611; 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=r90Y+nph6UomTYz86BHgWO2Cn33WkXL7hSAFJfQvzso=; b=Y5jyhkjyyqu8OqqmLSV3Dnzxr5I3SJobqRimwdyhBvP7kmhtO/K8Vj1RaYCoBrUxmEI3ib TFm2tblpLJDPnTlIYImUUDOywaBbasrTyKzxAohlZ5wnn6DY4Ykkt01sojnCt+24V1WS6U MZf3AjbpUXZ0DOBMgPYVEKJVtAtXEu47WATkQX8M7NK6PMe463qlNV6RcwIgZovG2bJqcr cxltUyqv6qWxY19CpwMmvWMzIcxl9NmRh2NwBE6qdC3SkVB1XWRbYWEFUPBj52sMsWkwuG LqUiH5gAO4VSk7DY9vD1gTK8bCw0wWK+Be8nb1iBwWycizyWFdwsRwQ3dc5dRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681802611; 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=r90Y+nph6UomTYz86BHgWO2Cn33WkXL7hSAFJfQvzso=; b=IvazYfZo9uHYRQ/TfCRmdvkEZbu6rG0Ya2Qaf5CzFgt0xtdd1V/iObO6y3Eao6xarBH6m3 jfd9ZbZ8yIHraacCXo6sjOtV3M+o8O7C1qXyJ6srZ4gB9aporB9afIQxCDx+eeREhIQyIQ HcLbJN/Q0qebAxyuYS4S33p96IZLofnMHxazAB/zTU+5WqVrP1Zmsxhyr3JysVpigLT5SZ I6QIPkuyqECM5jabuLj2tT/cdw4kygzvgPhAaNuEfuw8F1M2V2W105TdIyJ0DrPNYHmQrB tMvap9Zy2ceJQejX+64u8sD1WFD1zYa4gg+r/VLf2i73glyDGs7sP9E2MWm6ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681802611; a=rsa-sha256; cv=none; b=C/M2+EaA+LF/ANcOC4UEXXGePiMlg85HitEiZKFud3rFjBr42bQQgs/paSBNgAFxyrl3kU p1l0fPTtAP6c7/WbWt6zmNUBKAHBJwDqHMOPpMiBReyKu/UMGE5AvNHBdEzDUzDpq4fOuD 5b5j6PWwAQ8v01wMVckSJYWy/fdGCLvbJyVQPZrtcCuAONrnFgOwsz/Sidl4j4coybNhxU lCSNcPMjZhNLUnhcQjk7B+c3lUU4Blq8XN1Xfv92Z1jHEOIgGpbUxlRDW8Z0NYWCzMjgfm DIfWSH5XmrFoupjDkJyYPQIUjtSEj4VUktN5yJ6/58og7izJPaamKlqTsqMLYA== 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 4Q0wPv3g5Rz12sQ; Tue, 18 Apr 2023 07:23:31 +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 33I7NVuI021152; Tue, 18 Apr 2023 07:23:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33I7NVRC021151; Tue, 18 Apr 2023 07:23:31 GMT (envelope-from git) Date: Tue, 18 Apr 2023 07:23:31 GMT Message-Id: <202304180723.33I7NVRC021151@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 8011e2cd245e - stable/13 - if_epair: also remove vlan metadata from mbufs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 8011e2cd245e64469891a9afe23c32b3fef5e503 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8011e2cd245e64469891a9afe23c32b3fef5e503 commit 8011e2cd245e64469891a9afe23c32b3fef5e503 Author: Kristof Provost AuthorDate: 2023-04-10 11:02:55 +0000 Commit: Kristof Provost CommitDate: 2023-04-18 07:23:15 +0000 if_epair: also remove vlan metadata from mbufs We already remove mbuf tags from packets transitting an if_epair, but we didn't remove vlan metadata. In certain configurations this could lead to unexpected vlan tags turning up on the rx side. PR: 270736 Reviewed by: markj MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D39482 (cherry picked from commit c69ae8419734829404bdb47d694d105c85f9835e) --- sys/net/if_epair.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/net/if_epair.c b/sys/net/if_epair.c index 2404afe63e0a..662c601b3ad1 100644 --- a/sys/net/if_epair.c +++ b/sys/net/if_epair.c @@ -136,6 +136,8 @@ static struct epair_tasks_t epair_tasks; static void epair_clear_mbuf(struct mbuf *m) { + M_ASSERTPKTHDR(m); + /* Remove any CSUM_SND_TAG as ether_input will barf. */ if (m->m_pkthdr.csum_flags & CSUM_SND_TAG) { m_snd_tag_rele(m->m_pkthdr.snd_tag); @@ -143,6 +145,10 @@ epair_clear_mbuf(struct mbuf *m) m->m_pkthdr.csum_flags &= ~CSUM_SND_TAG; } + /* Clear vlan information. */ + m->m_flags &= ~M_VLANTAG; + m->m_pkthdr.ether_vtag = 0; + m_tag_delete_nonpersistent(m); }