From patchwork Fri Sep 7 06:51:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 1420121 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id CC7DD3FC33 for ; Fri, 7 Sep 2012 06:51:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753358Ab2IGGvs (ORCPT ); Fri, 7 Sep 2012 02:51:48 -0400 Received: from mail-qa0-f53.google.com ([209.85.216.53]:57148 "EHLO mail-qa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751136Ab2IGGvs (ORCPT ); Fri, 7 Sep 2012 02:51:48 -0400 Received: by mail-qa0-f53.google.com with SMTP id s11so1913741qaa.19 for ; Thu, 06 Sep 2012 23:51:47 -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=xar9vITHYIf6qMwE+hMakLmrqOxTS3D6Nhkxc3M7ffI=; b=Ejw4xWqYHU9TGc/DpZgHdQKdEqYBwVADeApv7kzb4KufRa4fEbe+PZ5CQhPrWG9EqR /LiypoJeEkFBU98D0RrgfXqU5Jb9FI0fAxUVYqjEGe8oFrsbXSRAGEEbqW26JgQp5E1S Tl2gKjqq1oHgcCZjxpDuW0RJEMuqqTOzCJ/LgA0HIsTanKJgJ5rV5Mdzqg4Vhpt9mQuT EL+QBJLmIOpXWDyp3r//oVFHwgWkNJ+DKCbo1Pe81Cxn0JvBQvgczWAjnzyhGcGFvs8Z 7JiM7LEgUNATVQwYuq3oLC6dnAAL5yLjj3wXfqYIlTgQPBeDcjFuobQyw+mha+JchKD7 mXEA== MIME-Version: 1.0 Received: by 10.224.179.7 with SMTP id bo7mr2446762qab.96.1347000707726; Thu, 06 Sep 2012 23:51:47 -0700 (PDT) Received: by 10.229.146.194 with HTTP; Thu, 6 Sep 2012 23:51:47 -0700 (PDT) Date: Fri, 7 Sep 2012 14:51:47 +0800 Message-ID: Subject: [PATCH] NFC: 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 ++-- drivers/nfc/pn544_hci.c | 3 ++- drivers/nfc/pn544.c | 3 ++- 3 files changed, 6 insertions(+), 4 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)); diff --git a/drivers/nfc/pn544_hci.c b/drivers/nfc/pn544_hci.c index aa71807..7b20f2d 100644 --- a/drivers/nfc/pn544_hci.c +++ b/drivers/nfc/pn544_hci.c @@ -341,13 +341,14 @@ flush: static irqreturn_t pn544_hci_irq_thread_fn(int irq, void *dev_id) { struct pn544_hci_info *info = dev_id; - struct i2c_client *client = info->i2c_dev; + struct i2c_client *client; struct sk_buff *skb = NULL; int r; BUG_ON(!info); BUG_ON(irq != info->i2c_dev->irq); + client = info->i2c_dev; dev_dbg(&client->dev, "IRQ\n"); if (info->hard_fault != 0) diff --git a/drivers/nfc/pn544.c b/drivers/nfc/pn544.c index 724f65d..33696d6 100644 --- a/drivers/nfc/pn544.c +++ b/drivers/nfc/pn544.c @@ -288,11 +288,12 @@ static int pn544_fw_read(struct i2c_client *client, u8 *buf, int buflen) static irqreturn_t pn544_irq_thread_fn(int irq, void *dev_id) { struct pn544_info *info = dev_id; - struct i2c_client *client = info->i2c_dev; + struct i2c_client *client; BUG_ON(!info); BUG_ON(irq != info->i2c_dev->irq); + client = info->i2c_dev; dev_dbg(&client->dev, "IRQ\n"); mutex_lock(&info->read_mutex);