Return-Path: Received: from mail-wi0-f182.google.com ([209.85.212.182]:37471 "EHLO mail-wi0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754455AbbIBMWL (ORCPT ); Wed, 2 Sep 2015 08:22:11 -0400 Received: by wicfx3 with SMTP id fx3so17119114wic.0 for ; Wed, 02 Sep 2015 05:22:10 -0700 (PDT) From: Alexander Aring Subject: [PATCH bluetooth-next 08/16] ieee802154: 6lowpan: trivial checks at first Date: Wed, 2 Sep 2015 14:21:23 +0200 Message-Id: <1441196491-25013-9-git-send-email-alex.aring@gmail.com> In-Reply-To: <1441196491-25013-1-git-send-email-alex.aring@gmail.com> References: <1441196491-25013-1-git-send-email-alex.aring@gmail.com> Sender: linux-wpan-owner@vger.kernel.org List-ID: To: linux-wpan@vger.kernel.org Cc: kernel@pengutronix.de, Alexander Aring This patch moves some trivial checks at first before calling skb_share_check which could do some memcpy if the buffer is shared. Reviewed-by: Stefan Schmidt Signed-off-by: Alexander Aring --- net/ieee802154/6lowpan/rx.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/ieee802154/6lowpan/rx.c b/net/ieee802154/6lowpan/rx.c index 4ddf694..74d8fec 100644 --- a/net/ieee802154/6lowpan/rx.c +++ b/net/ieee802154/6lowpan/rx.c @@ -63,7 +63,8 @@ static int lowpan_rcv(struct sk_buff *skb, struct net_device *wdev, struct net_device *ldev; int ret; - if (wdev->type != ARPHRD_IEEE802154) + if (wdev->type != ARPHRD_IEEE802154 || + skb->pkt_type == PACKET_OTHERHOST) goto drop; ldev = wdev->ieee802154_ptr->lowpan_dev; @@ -74,9 +75,6 @@ static int lowpan_rcv(struct sk_buff *skb, struct net_device *wdev, if (!skb) goto drop; - if (skb->pkt_type == PACKET_OTHERHOST) - goto drop_skb; - if (ieee802154_hdr_peek_addrs(skb, &hdr) < 0) goto drop_skb; -- 2.5.1