Skip to content

Commit

Permalink
6LoWPAN: fix skb_copy call
Browse files Browse the repository at this point in the history
This patch fixes 2 issues in lowpan_skb_deliver function:
1. Check for return status of skb_copy call;
2. Use skb_copy with proper GFP flag, drop check for non-interrupt
context.

Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
alex.bluesman.smirnov@gmail.com authored and David S. Miller committed Sep 15, 2011
1 parent fa3df92 commit dcef115
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions net/ieee802154/6lowpan.c
Original file line number Diff line number Diff line change
Expand Up @@ -479,10 +479,10 @@ static int lowpan_skb_deliver(struct sk_buff *skb, struct ipv6hdr *hdr)
int stat = NET_RX_SUCCESS;

new = skb_copy_expand(skb, sizeof(struct ipv6hdr), skb_tailroom(skb),
GFP_KERNEL);
GFP_ATOMIC);
kfree_skb(skb);

if (NULL == new)
if (!new)
return -ENOMEM;

skb_push(new, sizeof(struct ipv6hdr));
Expand All @@ -495,13 +495,14 @@ static int lowpan_skb_deliver(struct sk_buff *skb, struct ipv6hdr *hdr)
rcu_read_lock();
list_for_each_entry_rcu(entry, &lowpan_devices, list)
if (lowpan_dev_info(entry->ldev)->real_dev == new->dev) {
skb = skb_copy(new, GFP_KERNEL);
skb->dev = entry->ldev;
skb = skb_copy(new, GFP_ATOMIC);
if (!skb) {
stat = -ENOMEM;
break;
}

if (in_interrupt())
stat = netif_rx(skb);
else
stat = netif_rx_ni(skb);
skb->dev = entry->ldev;
stat = netif_rx(skb);
}
rcu_read_unlock();

Expand Down

0 comments on commit dcef115

Please sign in to comment.