From patchwork Sat Sep 8 01:53:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 1425931 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 3F6A3DF283 for ; Sat, 8 Sep 2012 01:53:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759270Ab2IHBxY (ORCPT ); Fri, 7 Sep 2012 21:53:24 -0400 Received: from mail-qc0-f174.google.com ([209.85.216.174]:33327 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751487Ab2IHBxX (ORCPT ); Fri, 7 Sep 2012 21:53:23 -0400 Received: by qcro28 with SMTP id o28so128834qcr.19 for ; Fri, 07 Sep 2012 18:53:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=asxiTQaA+g5tWaKad5WM9V9ZQncYNDGGOYvnfxvor+M=; b=QM67WbYy1Lf3iwHU3W68c+kH8WW5EhdjbNWh5kbQxSdAueSud1gByqdaAztR7sfgg9 QGE5noc5FLrr4IGOeLBRhMpyvMTVdnO8lLwUj1mmquvElUCaSalvtx727MdHIB//tCH8 Gadj/vRBuWk4NXDntJmK1UdW/ytF72w2aIH53xWr+Co2qT7NXrRXHqA93GQawLBn4SMF eh/srLX2McO5rN5jmdZKG4TmuHC6hK0Pb6OAxLBf0B8QCk9pgcGaj6yfRPSqN8vQ0I0H NythyD1Y7kDgCMxaQggwPfR5Up52oikfij5l0I4v4r307OXMEvEbJC2xUabj7rm6aX+7 pjiQ== MIME-Version: 1.0 Received: by 10.229.136.131 with SMTP id r3mr2338175qct.145.1347069202874; Fri, 07 Sep 2012 18:53:22 -0700 (PDT) Received: by 10.229.146.194 with HTTP; Fri, 7 Sep 2012 18:53:22 -0700 (PDT) Date: Sat, 8 Sep 2012 09:53:22 +0800 Message-ID: Subject: [PATCH v2] NFC: nfcwilink: move the dereference below the NULL test From: Wei Yongjun To: lauro.venancio@openbossa.org, aloisio.almeida@openbossa.org, sameo@linux.intel.com Cc: yongjun_wei@trendmicro.com.cn, linux-wireless@vger.kernel.org Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Wei Yongjun The dereference should be moved below the NULL test. spatch with a semantic match is used to found this. (http://coccinelle.lip6.fr/) Signed-off-by: Wei Yongjun --- drivers/nfc/nfcwilink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c index e7fd493..1a47190 100644 --- a/drivers/nfc/nfcwilink.c +++ b/drivers/nfc/nfcwilink.c @@ -352,8 +352,6 @@ static long nfcwilink_receive(void *priv_data, struct sk_buff *skb) struct nfcwilink *drv = priv_data; int rc; - nfc_dev_dbg(&drv->pdev->dev, "receive entry, len %d", skb->len); - if (!skb) return -EFAULT; @@ -362,6 +360,8 @@ static long nfcwilink_receive(void *priv_data, struct sk_buff *skb) return -EFAULT; } + nfc_dev_dbg(&drv->pdev->dev, "receive entry, len %d", skb->len); + /* strip the ST header (apart for the chnl byte, which is not received in the hdr) */ skb_pull(skb, (NFCWILINK_HDR_LEN-1));