mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
bonding: correctly process non-linear skbs
It was recently brought to my attention that 802.3ad mode bonds would no longer form when using some network hardware after a driver update. After snooping around I realized that the particular hardware was using page-based skbs and found that skb->data did not contain a valid LACPDU as it was not stored there. That explained the inability to form an 802.3ad-based bond. For balance-alb mode bonds this was also an issue as ARPs would not be properly processed. This patch fixes the issue in my tests and should be applied to 2.6.36 and as far back as anyone cares to add it to stable. Thanks to Alexander Duyck <alexander.h.duyck@intel.com> and Jesse Brandeburg <jesse.brandeburg@intel.com> for the suggestions on this one. Signed-off-by: Andy Gospodarek <andy@greyhouse.net> CC: Alexander Duyck <alexander.h.duyck@intel.com> CC: Jesse Brandeburg <jesse.brandeburg@intel.com> CC: stable@kerne.org Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
a89b47639f
commit
ab12811c89
2 changed files with 6 additions and 0 deletions
|
@ -2466,6 +2466,9 @@ int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct pac
|
||||||
if (!(dev->flags & IFF_MASTER))
|
if (!(dev->flags & IFF_MASTER))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
if (!pskb_may_pull(skb, sizeof(struct lacpdu)))
|
||||||
|
goto out;
|
||||||
|
|
||||||
read_lock(&bond->lock);
|
read_lock(&bond->lock);
|
||||||
slave = bond_get_slave_by_dev((struct bonding *)netdev_priv(dev),
|
slave = bond_get_slave_by_dev((struct bonding *)netdev_priv(dev),
|
||||||
orig_dev);
|
orig_dev);
|
||||||
|
|
|
@ -362,6 +362,9 @@ static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!pskb_may_pull(skb, arp_hdr_len(bond_dev)))
|
||||||
|
goto out;
|
||||||
|
|
||||||
if (skb->len < sizeof(struct arp_pkt)) {
|
if (skb->len < sizeof(struct arp_pkt)) {
|
||||||
pr_debug("Packet is too small to be an ARP\n");
|
pr_debug("Packet is too small to be an ARP\n");
|
||||||
goto out;
|
goto out;
|
||||||
|
|
Loading…
Reference in a new issue