Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcef1151 authored by alex.bluesman.smirnov@gmail.com's avatar alex.bluesman.smirnov@gmail.com Committed by David S. Miller
Browse files

6LoWPAN: fix skb_copy call 



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: default avatarAlexander Smirnov <alex.bluesman.smirnov@gmail.com>
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fa3df928

net/ieee802154/6lowpan.c

+9 −8
Original line number Diff line number Diff line
@@ -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));
@@ -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())

			skb->dev = entry->ldev;

			stat = netif_rx(skb);

			else

				stat = netif_rx_ni(skb);

		}

	rcu_read_unlock();