lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: Account for all vlan headers in skb_mac_gso_segment

Browse Source 
skb_network_protocol() already accounts for multiple vlan
headers that may be present in the skb.  However, skb_mac_gso_segment()
doesn't know anything about it and assumes that skb->mac_len
is set correctly to skip all mac headers.  That may not
always be the case.  If we are simply forwarding the packet (via
bridge or macvtap), all vlan headers may not be accounted for.

A simple solution is to allow skb_network_protocol to return
the vlan depth it has calculated.  This way skb_mac_gso_segment
will correctly skip all mac headers.

Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vlad Yasevich
2014-03-27 17:26:18 -04:00
committed by David S. Miller
parent 898602a049
commit 53d6471cef
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/netdevice.h
View File

@@ -3014,7 +3014,7 @@ struct sk_buff *skb_gso_segment(struct sk_buff *skb, netdev_features_t features)
{ {
return __skb_gso_segment(skb, features, true); return __skb_gso_segment(skb, features, true);
} }
__be16 skb_network_protocol(struct sk_buff *skb); __be16 skb_network_protocol(struct sk_buff *skb, int *depth);
static inline bool can_checksum_protocol(netdev_features_t features, static inline bool can_checksum_protocol(netdev_features_t features,
__be16 protocol) __be16 protocol)

13
net/core/dev.c
View File

@@ -2286,7 +2286,7 @@ out:
} }
EXPORT_SYMBOL(skb_checksum_help); EXPORT_SYMBOL(skb_checksum_help);
__be16 skb_network_protocol(struct sk_buff *skb) __be16 skb_network_protocol(struct sk_buff *skb, int *depth)
{ {
__be16 type = skb->protocol; __be16 type = skb->protocol;
int vlan_depth = ETH_HLEN; int vlan_depth = ETH_HLEN;
@@ -2313,6 +2313,8 @@ __be16 skb_network_protocol(struct sk_buff *skb)
vlan_depth += VLAN_HLEN; vlan_depth += VLAN_HLEN;
} }
*depth = vlan_depth;
return type; return type;
} }
@@ -2326,12 +2328,13 @@ struct sk_buff *skb_mac_gso_segment(struct sk_buff *skb,
{ {
struct sk_buff *segs = ERR_PTR(-EPROTONOSUPPORT); struct sk_buff *segs = ERR_PTR(-EPROTONOSUPPORT);
struct packet_offload *ptype; struct packet_offload *ptype;
__be16 type = skb_network_protocol(skb); int vlan_depth = skb->mac_len;
__be16 type = skb_network_protocol(skb, &vlan_depth);
if (unlikely(!type)) if (unlikely(!type))
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
__skb_pull(skb, skb->mac_len); __skb_pull(skb, vlan_depth);
rcu_read_lock(); rcu_read_lock();
list_for_each_entry_rcu(ptype, &offload_base, list) { list_for_each_entry_rcu(ptype, &offload_base, list) {
@@ -2498,8 +2501,10 @@ static netdev_features_t harmonize_features(struct sk_buff *skb,
const struct net_device *dev, const struct net_device *dev,
netdev_features_t features) netdev_features_t features)
{ {
int tmp;
if (skb->ip_summed != CHECKSUM_NONE && if (skb->ip_summed != CHECKSUM_NONE &&
!can_checksum_protocol(features, skb_network_protocol(skb))) { !can_checksum_protocol(features, skb_network_protocol(skb, &tmp))) {
features &= ~NETIF_F_ALL_CSUM; features &= ~NETIF_F_ALL_CSUM;
} else if (illegal_highdma(dev, skb)) { } else if (illegal_highdma(dev, skb)) {
features &= ~NETIF_F_SG; features &= ~NETIF_F_SG;

3
net/core/skbuff.c
View File

@@ -2879,8 +2879,9 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
int err = -ENOMEM; int err = -ENOMEM;
int i = 0; int i = 0;
int pos; int pos;
int dummy;
proto = skb_network_protocol(head_skb); proto = skb_network_protocol(head_skb, &dummy);
if (unlikely(!proto)) if (unlikely(!proto))
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);