| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20080411135714.GA8137@tp64>
Date: Fri, 11 Apr 2008 22:57:14 +0900
From: Joonwoo Park <joonwpark81@...il.com>
To: kaber@...sh.net
Cc: davem@...emloft.net, netdev@...r.kernel.org
Subject: [PATCH 1/5] [VLAN]: Unclassified vlan packet
To be polite to the PACKET,
Don't kill the unclassified & hardware accelerated vlan packets if netdev
is in promiscuous, set packet type with PACKET_OTHERHOST.
Put the vlan tag into skb->cb for all hardware accelerated vlan packets.
Signed-off-by: Joonwoo Park <joonwpark81@...il.com>
---
include/linux/if_vlan.h | 56 +++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 21 deletions(-)
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index 79504b2..e400141 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -62,6 +62,9 @@ struct vlan_ethhdr {
#include <linux/skbuff.h>
+static inline struct sk_buff *__vlan_hwaccel_put_tag(struct sk_buff *skb,
+ unsigned short tag);
+
static inline struct vlan_ethhdr *vlan_eth_hdr(const struct sk_buff *skb)
{
return (struct vlan_ethhdr *)skb_mac_header(skb);
@@ -175,14 +178,19 @@ static inline int __vlan_hwaccel_rx(struct sk_buff *skb,
unsigned short vlan_tag, int polling)
{
struct net_device_stats *stats;
+ struct net_device *vlan_dev;
if (skb_bond_should_drop(skb)) {
dev_kfree_skb_any(skb);
return NET_RX_DROP;
}
- skb->dev = vlan_group_get_device(grp, vlan_tag & VLAN_VID_MASK);
- if (skb->dev == NULL) {
+ vlan_dev = vlan_group_get_device(grp, vlan_tag & VLAN_VID_MASK);
+ if (vlan_dev)
+ skb->dev = vlan_dev;
+ else if (skb->dev->flags & IFF_PROMISC)
+ skb->pkt_type = PACKET_OTHERHOST;
+ else {
dev_kfree_skb_any(skb);
/* Not NET_RX_DROP, this is not being dropped
@@ -191,31 +199,37 @@ static inline int __vlan_hwaccel_rx(struct sk_buff *skb,
return 0;
}
+ /* Deliever vlan_tag to PACKET */
+ __vlan_hwaccel_put_tag(skb, vlan_tag);
+
skb->dev->last_rx = jiffies;
stats = &skb->dev->stats;
stats->rx_packets++;
stats->rx_bytes += skb->len;
- skb->priority = vlan_get_ingress_priority(skb->dev, vlan_tag);
- switch (skb->pkt_type) {
- case PACKET_BROADCAST:
- break;
-
- case PACKET_MULTICAST:
- stats->multicast++;
- break;
-
- case PACKET_OTHERHOST:
- /* Our lower layer thinks this is not local, let's make sure.
- * This allows the VLAN to have a different MAC than the underlying
- * device, and still route correctly.
- */
- if (!compare_ether_addr(eth_hdr(skb)->h_dest,
- skb->dev->dev_addr))
- skb->pkt_type = PACKET_HOST;
- break;
- };
+ if (vlan_dev) {
+ skb->priority = vlan_get_ingress_priority(skb->dev, vlan_tag);
+ switch (skb->pkt_type) {
+ case PACKET_BROADCAST:
+ break;
+
+ case PACKET_MULTICAST:
+ stats->multicast++;
+ break;
+
+ case PACKET_OTHERHOST:
+ /* Our lower layer thinks this is not local, let's
+ * make sure.
+ * This allows the VLAN to have a different MAC than
+ * the underlying device, and still route correctly.
+ */
+ if (!compare_ether_addr(eth_hdr(skb)->h_dest,
+ skb->dev->dev_addr))
+ skb->pkt_type = PACKET_HOST;
+ break;
+ };
+ }
return (polling ? netif_receive_skb(skb) : netif_rx(skb));
}
--
1.5.4.3
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists