Re: [PATCH net-next-2.6] fix bonding: allow arp_ip_targets on separate vlans to use arp validation

[Jay Vosburgh <fubar@us.ibm.com>]

Andy Gospodarek <andy@greyhouse.net> wrote:

>This patch fixes up a problem with found with commit
>1f3c8804acba841b5573b953f5560d2683d2db0d.  The original change
>overloaded null_or_orig, but doing that prevented any packet handlers
>that were not tied to a specific device (i.e. ptype->dev == NULL) from
>ever receiving any frames.
>
>The null_or_orig variable cannot be overloaded, and must be kept as NULL
>to prevent the frame from being ignored by packet handlers designed to
>accept frames on any interface.
>
>Signed-off-by: Andy Gospodarek <andy@greyhouse.net>

	Tested, and it appears to work fine.  Tcpdump also appears to
behave rationally.

	-J

Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>


>---
> dev.c |   11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
>diff --git a/net/core/dev.c b/net/core/dev.c
>index f9aa699..d9ab9be 100644
>--- a/net/core/dev.c
>+++ b/net/core/dev.c
>@@ -2430,6 +2430,7 @@ int netif_receive_skb(struct sk_buff *skb)
> 	struct packet_type *ptype, *pt_prev;
> 	struct net_device *orig_dev;
> 	struct net_device *null_or_orig;
>+	struct net_device *null_or_bond;
> 	int ret = NET_RX_DROP;
> 	__be16 type;
>
>@@ -2500,21 +2501,19 @@ ncls:
> 	 * bonding interfaces still make their way to any base bonding
> 	 * device that may have registered for a specific ptype.  The
> 	 * handler may have to adjust skb->dev and orig_dev.
>-	 *
>-	 * null_or_orig can be overloaded since it will not be set when
>-	 * using VLANs on top of bonding.  Putting it here prevents
>-	 * disturbing the ptype_all handlers above.
> 	 */
>+	null_or_bond = NULL;
> 	if ((skb->dev->priv_flags & IFF_802_1Q_VLAN) &&
> 	    (vlan_dev_real_dev(skb->dev)->priv_flags & IFF_BONDING)) {
>-		null_or_orig = vlan_dev_real_dev(skb->dev);
>+		null_or_bond = vlan_dev_real_dev(skb->dev);
> 	}
>
> 	type = skb->protocol;
> 	list_for_each_entry_rcu(ptype,
> 			&ptype_base[ntohs(type) & PTYPE_HASH_MASK], list) {
> 		if (ptype->type == type && (ptype->dev == null_or_orig ||
>-		     ptype->dev == skb->dev || ptype->dev == orig_dev)) {
>+		     ptype->dev == skb->dev || ptype->dev == orig_dev ||
>+		     ptype->dev == null_or_bond)) {
> 			if (pt_prev)
> 				ret = deliver_skb(skb, pt_prev, orig_dev);
> 			pt_prev = ptype;
>--
>To unsubscribe from this list: send the line "unsubscribe netdev" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at  http://vger.kernel.org/majordomo-info.html