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
| ||
|
Date: Thu, 8 Aug 2013 12:21:05 +0200 From: Veaceslav Falico <vfalico@...hat.com> To: netdev@...r.kernel.org Cc: Veaceslav Falico <vfalico@...hat.com>, Patrick McHardy <kaber@...sh.net>, "David S. Miller" <davem@...emloft.net> Subject: [PATCH v1 net-next 2/6] vlan: add __vlan_find_dev_next() RFC -> v1: make the function accept/return vlan's net_device, this way we won't have troubles with VLAN 0, and the user code will be cleaner and faster. Add a new exported function __vlan_find_dev_next(dev, vlan_dev), which returns the a vlan's net_device that is used by the dev and is its id is greater or equal to vlan_dev's vlan id. If vlan_dev is NULL, return first vlan, if nothing is found return NULL. This function must be under rcu_read_lock(), is aware of master devices and doesn't guarantee that, once it returns, the vlan dev will still be used by dev as its vlan. It's basically a helper for "for_each_vlan_in_dev(dev, vlan_dev)" logic, and is supposed to be used like this: vlan_dev = NULL; while ((vlan_dev = __vlan_find_dev_next(dev, vlan_dev))) { if (!vlan_dev) continue; do_work(vlan_dev); } In that case we're sure that vlan_dev at least was used as a vlan, and won't go away while we're holding rcu_read_lock(). However, if we don't hold rtnl_lock(), we can't be sure that that vlan_dev is still in dev's vlan_list. CC: Patrick McHardy <kaber@...sh.net> CC: "David S. Miller" <davem@...emloft.net> Signed-off-by: Veaceslav Falico <vfalico@...hat.com> --- include/linux/if_vlan.h | 8 ++++++++ net/8021q/vlan.h | 6 ++++-- net/8021q/vlan_core.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 715c343..1cfc201 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -86,6 +86,8 @@ static inline int is_vlan_dev(struct net_device *dev) extern struct net_device *__vlan_find_dev_deep(struct net_device *real_dev, __be16 vlan_proto, u16 vlan_id); +extern struct net_device *__vlan_find_dev_next(struct net_device *dev, + struct net_device *vlan_dev); extern struct net_device *vlan_dev_real_dev(const struct net_device *dev); extern u16 vlan_dev_vlan_id(const struct net_device *dev); @@ -109,6 +111,12 @@ __vlan_find_dev_deep(struct net_device *real_dev, return NULL; } +static struct net_device *__vlan_find_dev_next(struct net_device *dev, + struct net_device *vlan_dev) +{ + return NULL; +} + static inline struct net_device *vlan_dev_real_dev(const struct net_device *dev) { BUG(); diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h index ba5983f..e13aeac 100644 --- a/net/8021q/vlan.h +++ b/net/8021q/vlan.h @@ -168,10 +168,12 @@ static inline struct net_device *vlan_find_dev(struct net_device *real_dev, return NULL; } -#define vlan_group_for_each_dev(grp, i, dev) \ - for ((i) = 0; i < VLAN_PROTO_NUM * VLAN_N_VID; i++) \ +#define vlan_group_for_each_dev_from(grp, i, dev, from) \ + for ((i) = from; i < VLAN_PROTO_NUM * VLAN_N_VID; i++) \ if (((dev) = __vlan_group_get_device((grp), (i) / VLAN_N_VID, \ (i) % VLAN_N_VID))) +#define vlan_group_for_each_dev(grp, i, dev) \ + vlan_group_for_each_dev_from(grp, i, dev, 0) /* found in vlan_dev.c */ void vlan_dev_set_ingress_priority(const struct net_device *dev, diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c index 12e1606..20e1f92 100644 --- a/net/8021q/vlan_core.c +++ b/net/8021q/vlan_core.c @@ -89,6 +89,39 @@ struct net_device *__vlan_find_dev_deep(struct net_device *dev, } EXPORT_SYMBOL(__vlan_find_dev_deep); +/* Must be called under rcu_read_lock(), returns next vlan_id used by a + * vlan device on dev, starting with vlan_id, or 0 if no vlan_id found. + */ +struct net_device *__vlan_find_dev_next(struct net_device *dev, + struct net_device *vlan_dev) +{ + struct net_device *real_dev = dev, *master_dev, *ret; + struct vlan_info *vlan_info; + struct vlan_group *grp; + u16 vlan_id = 0, i; + + if (vlan_dev) + vlan_id = vlan_dev_priv(vlan_dev)->vlan_id + 1; + + master_dev = netdev_master_upper_dev_get_rcu(real_dev); + + if (master_dev) + real_dev = master_dev; + + vlan_info = rcu_dereference(real_dev->vlan_info); + + if (!vlan_info) + return NULL; + + grp = &vlan_info->grp; + + vlan_group_for_each_dev_from(grp, i, ret, vlan_id) + return ret; + + return NULL; +} +EXPORT_SYMBOL(__vlan_find_dev_next); + struct net_device *vlan_dev_real_dev(const struct net_device *dev) { return vlan_dev_priv(dev)->real_dev; -- 1.7.1 -- 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