From owner-freebsd-bugs@FreeBSD.ORG Thu Nov 11 17:20:09 2010 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5235E10656A4 for ; Thu, 11 Nov 2010 17:20:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id DB7D08FC1E for ; Thu, 11 Nov 2010 17:20:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oABHK8gW065604 for ; Thu, 11 Nov 2010 17:20:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oABHK8L8065603; Thu, 11 Nov 2010 17:20:08 GMT (envelope-from gnats) Resent-Date: Thu, 11 Nov 2010 17:20:08 GMT Resent-Message-Id: <201011111720.oABHK8L8065603@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rozhuk Ivan Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B6003106566B for ; Thu, 11 Nov 2010 17:18:59 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 8AA858FC13 for ; Thu, 11 Nov 2010 17:18:59 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id oABHIx9G040120 for ; Thu, 11 Nov 2010 17:18:59 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id oABHIx0H040119; Thu, 11 Nov 2010 17:18:59 GMT (envelope-from nobody) Message-Id: <201011111718.oABHIx0H040119@www.freebsd.org> Date: Thu, 11 Nov 2010 17:18:59 GMT From: Rozhuk Ivan To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: kern/152141: encapsulate vlan in ng_ether before output to if X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Nov 2010 17:20:09 -0000 >Number: 152141 >Category: kern >Synopsis: encapsulate vlan in ng_ether before output to if >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Nov 11 17:20:08 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Rozhuk Ivan >Release: 9.0-CURRENT >Organization: >Environment: FreeBSD firewall 9.0-CURRENT FreeBSD 9.0-CURRENT #9: Sun Oct 31 16:36:54 IRKT 2010 root@firewall:/usr/obj/usr/src/sys/RIMx64 amd64 >Description: ether_input decapsulate vlan from ethernet header and add M_VLANTAG flag to mbuff set m->m_pkthdr.ether_vtag then packet transmited to ng_ether_input but(!) ng_ether_rcv_lower does not encapsulate vlan tag before send packet if_bridge - encapsulate >How-To-Repeat: >Fix: /* * Handle an mbuf received on the "lower" or "orphan" hook. */ static int ng_ether_rcv_lower(hook_p hook, item_p item) { struct mbuf *m; const node_p node = NG_HOOK_NODE(hook); const priv_p priv = NG_NODE_PRIVATE(node); struct ifnet *const ifp = priv->ifp; NGI_GET_M(item, m); NG_FREE_ITEM(item); /* Check whether interface is ready for packets */ if (!((ifp->if_flags & IFF_UP) && (ifp->if_drv_flags & IFF_DRV_RUNNING))) { NG_FREE_M(m); return (ENETDOWN); } /* Make sure header is fully pulled up */ if (m->m_pkthdr.len < sizeof(struct ether_header)) { NG_FREE_M(m); return (EINVAL); } if (m->m_len < sizeof(struct ether_header) && (m = m_pullup(m, sizeof(struct ether_header))) == NULL) return (ENOBUFS); /* Drop in the MAC address if desired */ if (priv->autoSrcAddr) { /* Make the mbuf writable if it's not already */ if (!M_WRITABLE(m) && (m = m_pullup(m, sizeof(struct ether_header))) == NULL) return (ENOBUFS); /* Overwrite source MAC address */ bcopy(IF_LLADDR(ifp), mtod(m, struct ether_header *)->ether_shost, ETHER_ADDR_LEN); } /* * If underlying interface can not do VLAN tag insertion itself * then attach a packet tag that holds it. */ if ((m->m_flags & M_VLANTAG) && (ifp->if_capenable & IFCAP_VLAN_HWTAGGING) == 0) { m = ether_vlanencap(m, m->m_pkthdr.ether_vtag); if (m == NULL) { ifp->if_oerrors++; return (ENOBUFS); } m->m_flags &= ~M_VLANTAG; } /* Send it on its way */ return ether_output_frame(ifp, m); } >Release-Note: >Audit-Trail: >Unformatted: