Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch 'rmnet-fixes'

Subash Abhinov Kasiviswanathan says:

====================
net: qualcomm: rmnet: Updates 2018-10-02

This series is a set of small fixes for rmnet driver

Patch 1 is a fix for a scenario reported by syzkaller
Patch 2 & 3 are fixes for incorrect allocation flags
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

+5 -2
+5 -2
drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
··· 113 113 struct sk_buff *skbn; 114 114 115 115 if (skb->dev->type == ARPHRD_ETHER) { 116 - if (pskb_expand_head(skb, ETH_HLEN, 0, GFP_KERNEL)) { 116 + if (pskb_expand_head(skb, ETH_HLEN, 0, GFP_ATOMIC)) { 117 117 kfree_skb(skb); 118 118 return; 119 119 } ··· 147 147 } 148 148 149 149 if (skb_headroom(skb) < required_headroom) { 150 - if (pskb_expand_head(skb, required_headroom, 0, GFP_KERNEL)) 150 + if (pskb_expand_head(skb, required_headroom, 0, GFP_ATOMIC)) 151 151 return -ENOMEM; 152 152 } 153 153 ··· 188 188 189 189 if (!skb) 190 190 goto done; 191 + 192 + if (skb->pkt_type == PACKET_LOOPBACK) 193 + return RX_HANDLER_PASS; 191 194 192 195 dev = skb->dev; 193 196 port = rmnet_get_port(dev);