3.16.62-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Alexander Aring <[email protected]> commit ac74f87c789af40936a80131c4759f3e72579c3a upstream. This patch fixes patch add handling to take care tail and headroom for single 6lowpan frames. We need to be sure we have a skb with the right head and tailroom for single frames. This patch do it by using skb_copy_expand() if head and tailroom is not enough allocated by upper layer. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=195059 Reported-by: David Palma <[email protected]> Reported-by: Rabi Narayan Sahoo <[email protected]> Signed-off-by: Alexander Aring <[email protected]> Signed-off-by: Stefan Schmidt <[email protected]> [bwh: Backported to 3.16: - s/ldev/dev/ - Adjust filename] Signed-off-by: Ben Hutchings <[email protected]> --- net/ieee802154/6lowpan_rtnl.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) --- a/net/ieee802154/6lowpan_rtnl.c +++ b/net/ieee802154/6lowpan_rtnl.c @@ -388,9 +388,24 @@ static netdev_tx_t lowpan_xmit(struct sk /* We must take a copy of the skb before we modify/replace the ipv6 * header as the header could be used elsewhere */ - skb = skb_unshare(skb, GFP_ATOMIC); - if (!skb) - return NET_XMIT_DROP; + if (unlikely(skb_headroom(skb) < dev->needed_headroom || + skb_tailroom(skb) < dev->needed_tailroom)) { + struct sk_buff *nskb; + + nskb = skb_copy_expand(skb, dev->needed_headroom, + dev->needed_tailroom, GFP_ATOMIC); + if (likely(nskb)) { + consume_skb(skb); + skb = nskb; + } else { + kfree_skb(skb); + return NET_XMIT_DROP; + } + } else { + skb = skb_unshare(skb, GFP_ATOMIC); + if (!skb) + return NET_XMIT_DROP; + } ret = lowpan_header(skb, dev); if (ret < 0) {
