mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
[VLAN/BRIDGE]: Fix "skb_pull_rcsum - Fatal exception in interrupt"
I tried to preserve bridging code as it was before, but logic is quite strange - I think we should free skb on error, since it is already unshared and thus will just leak. Herbert Xu states: > + if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) > + goto out; If this happens it'll be a double-free on skb since we'll return NF_DROP which makes the caller free it too. We could return NF_STOLEN to prevent that but I'm not sure whether that's correct netfilter semantics. Patrick, could you please make a call on this? Patrick McHardy states: NF_STOLEN should work fine here. Signed-off-by: Evgeniy Polyakov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
7c8347a91d
commit
e7c243c925
2 changed files with 18 additions and 6 deletions
|
|
@ -116,12 +116,22 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
|
|||
struct packet_type* ptype, struct net_device *orig_dev)
|
||||
{
|
||||
unsigned char *rawp = NULL;
|
||||
struct vlan_hdr *vhdr = (struct vlan_hdr *)(skb->data);
|
||||
struct vlan_hdr *vhdr;
|
||||
unsigned short vid;
|
||||
struct net_device_stats *stats;
|
||||
unsigned short vlan_TCI;
|
||||
__be16 proto;
|
||||
|
||||
if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
|
||||
return -1;
|
||||
|
||||
if (unlikely(!pskb_may_pull(skb, VLAN_HLEN))) {
|
||||
kfree_skb(skb);
|
||||
return -1;
|
||||
}
|
||||
|
||||
vhdr = (struct vlan_hdr *)(skb->data);
|
||||
|
||||
/* vlan_TCI = ntohs(get_unaligned(&vhdr->h_vlan_TCI)); */
|
||||
vlan_TCI = ntohs(vhdr->h_vlan_TCI);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue