diff options
author | Joel Stanley <joel@jms.id.au> | 2016-02-02 13:23:36 +1100 |
---|---|---|
committer | Joel Stanley <joel@jms.id.au> | 2016-02-02 13:23:42 +1100 |
commit | f3f4aeb9ea8954c0da3cf0d12693f9a57f1f4ac7 (patch) | |
tree | 3663ab29736373c565d88e941162d37311cc3c75 /net/phonet/af_phonet.c | |
parent | 2a3f5f14fdf2e8fb680af168fa642ef8a9218ffb (diff) | |
parent | 849a2d3d9be31368559e6852cf64d749e6903818 (diff) | |
download | talos-obmc-linux-openbmc-20160202-1.tar.gz talos-obmc-linux-openbmc-20160202-1.zip |
Merge tag 'v4.3.5' into dev-4.3openbmc-20160202-1
This is the 4.3.5 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'net/phonet/af_phonet.c')
-rw-r--r-- | net/phonet/af_phonet.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c index 10d42f3220ab..f925753668a7 100644 --- a/net/phonet/af_phonet.c +++ b/net/phonet/af_phonet.c @@ -377,6 +377,10 @@ static int phonet_rcv(struct sk_buff *skb, struct net_device *dev, struct sockaddr_pn sa; u16 len; + skb = skb_share_check(skb, GFP_ATOMIC); + if (!skb) + return NET_RX_DROP; + /* check we have at least a full Phonet header */ if (!pskb_pull(skb, sizeof(struct phonethdr))) goto out; |