[PATCH v2 -next] 6LoWPAN: fix skb_copy call
flat view
DORMANTno replies
From: Alexander Smirnov <hidden>
Date: 2011-09-01 12:54:13
Also in:
kernel-janitors
Subsystem:
ieee 802.15.4 subsystem, networking [general], the rest · Maintainers:
Alexander Aring, Stefan Schmidt, Miquel Raynal, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2011-09-15 · Re: [PATCH v2 -next] 6LoWPAN: fix skb_copy call · David Miller <hidden>
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 depending on context. Signed-off-by: Alexander Smirnov <redacted> --- net/ieee802154/6lowpan.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
index cf304cc..16100be 100644
--- a/net/ieee802154/6lowpan.c
+++ b/net/ieee802154/6lowpan.c@@ -477,9 +477,15 @@ static int lowpan_skb_deliver(struct sk_buff *skb, struct ipv6hdr *hdr) struct sk_buff *new; struct lowpan_dev_record *entry; int stat = NET_RX_SUCCESS; + gfp_t mask; - new = skb_copy_expand(skb, sizeof(struct ipv6hdr), skb_tailroom(skb), - GFP_KERNEL); + if (in_interrupt()) + mask = GFP_ATOMIC; + else + mask = GFP_KERNEL; + + new = skb_copy_expand(skb, sizeof(struct ipv6hdr), + skb_tailroom(skb), mask); kfree_skb(skb); if (NULL == new)
@@ -495,7 +501,13 @@ 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 = skb_copy(new, mask); + + if (NULL == skb) { + stat = -ENOMEM; + break; + } + skb->dev = entry->ldev; if (in_interrupt())
--
1.7.2.5
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev