From patchwork Tue Jul 25 19:29:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 108668 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp939256qge; Tue, 25 Jul 2017 12:29:32 -0700 (PDT) X-Received: by 10.99.125.11 with SMTP id y11mr20507990pgc.19.1501010972828; Tue, 25 Jul 2017 12:29:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501010972; cv=none; d=google.com; s=arc-20160816; b=iSW1hmrK2649ZgIHfDZIFovzy3fslTxO66kzfNDLNKtqy8S2FKGKR8s88VdvmL8NUz wcWHGhMIdNTyr7ZCGVOviuPVtPq36Y1VZQxsoodrvFMpAkagO/eVdnIttqnWXYtAhNWb wKure4IQ89LJ/mIv+HcUh93fBAQh/T5hzae9P6eYY33i8atJpcz/Sz62c6cR47Ur7GnC oRAeC+QTUsNPLnC4mM385vxT6FZ+i+zlcPOMXGfEOO6CMuXQQvTGV9tn+EaTpT8q8phG s4hJ00eD5fTJFq3nZFfUT8+6Isg+UxJY6F2MO7ZwxgX+PEZJAWk8Q5RiK16Vf7s1H8Uw youg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=xXWz0AoXVadCrmW0vr1TiHHn1jmsAfTq7THtlb+9LrA=; b=aA+KjWji5Yti+CFcYKghT3hnKxF1BLWzCIMNrRIEb6PW8O3cDK9IZfrqNijGWPfDkQ 0aXk9ll/kRmZBSQmMrQVH5LtkSgx3JwuGbAAoMlCxAwmzjCA3/fUbDrxDQJo2Xy26sih 0qS52FLykRIQWZBdmPOi1lv8ZmVBrUH6vHxLqisEcMvR+R/P3RXbTaZqabbNzTiz6gTO EF46lhWJ5VKjDO1H8Qy5pqMtzKFPcPz5gaA5PDVk0aTMp+LKSG8EPRkssrHxYnB/GkHX miX8kVaRSvHtX9O2kMmnXaF+Wc6ZVG7HjWzm5ASj2xQy8zgGNqsbH1HCQtHyCJjDaCL0 GqiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=DdjiVkAe; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o129si8605553pga.543.2017.07.25.12.29.32; Tue, 25 Jul 2017 12:29:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=DdjiVkAe; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751984AbdGYT3b (ORCPT + 6 others); Tue, 25 Jul 2017 15:29:31 -0400 Received: from mail-pf0-f175.google.com ([209.85.192.175]:33885 "EHLO mail-pf0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754432AbdGYT3a (ORCPT ); Tue, 25 Jul 2017 15:29:30 -0400 Received: by mail-pf0-f175.google.com with SMTP id q85so62010235pfq.1 for ; Tue, 25 Jul 2017 12:29:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xXWz0AoXVadCrmW0vr1TiHHn1jmsAfTq7THtlb+9LrA=; b=DdjiVkAe9SBJJVaZZq5/EuUaLYEmVdFIATV+oXD+5m/HmC5IKMbULkoZFHmLnHB3ZA rBCHD9SyPcDQRcEu1CsqICN2QI5W0xTxMoCO0jVokRoOAqsEN3dHu+K8/6BErW1/mTMR V6ljnsnScpvqrAd2pzGXkLh9st6BIDxbTvC/g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xXWz0AoXVadCrmW0vr1TiHHn1jmsAfTq7THtlb+9LrA=; b=bWlPjSfepkFY2778Nbdh9bazu6sp1/Yf960EHOOdUlvyKb3Fo/2dMzaoceDEhFugts KmtaRWlpfDk2AGOYazhCirxlMhRjp1y0GLVVmanwVzxJK8yhzEnE2vYHayxMa2EGRcUr 3h5EyaSYEcF7zJYhK3RZZqPmLOPmNsIWFrPnUPOdKcE9YVKK8/qAy/e7KY4xGY7pwLpL mPW6iKNmeCLTvf3xTwPECNdjxdECEC4miX49M/moswgh1Ukgf9tZOdrATzmM0LIOX5fx 7C7ee1dhKqflAYVs0U2Cm4PC95+EVPtFGrbQsTV9Uniwjq7jr488kQjSkVtW26YuazPd eLjw== X-Gm-Message-State: AIVw1133GEXkdw22nndUotS5oPTyaF12OL26oGv4Je0eAl0sKzmmU6yx 6m/wDL4jlTjKW0Y5 X-Received: by 10.98.14.195 with SMTP id 64mr8205593pfo.10.1501010969735; Tue, 25 Jul 2017 12:29:29 -0700 (PDT) Received: from localhost.localdomain ([106.51.135.235]) by smtp.gmail.com with ESMTPSA id 85sm30371425pfr.90.2017.07.25.12.29.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Jul 2017 12:29:28 -0700 (PDT) From: Amit Pundir To: Greg KH Cc: Stable , Sudip Mukherjee , Sudip Mukherjee , Samuel Ortiz Subject: [PATCH for-4.9 03/10] nfc: fdp: fix NULL pointer dereference Date: Wed, 26 Jul 2017 00:59:09 +0530 Message-Id: <1501010956-27944-4-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1501010956-27944-1-git-send-email-amit.pundir@linaro.org> References: <1501010956-27944-1-git-send-email-amit.pundir@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sudip Mukherjee commit b6355fb3f5f40bbce165847d277e64896cab8f95 upstream. We are checking phy after dereferencing it. We can print the debug information after checking it. If phy is NULL then we will get a good stack trace to tell us that we are in this irq handler. Signed-off-by: Sudip Mukherjee Signed-off-by: Samuel Ortiz Signed-off-by: Amit Pundir --- drivers/nfc/fdp/i2c.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/drivers/nfc/fdp/i2c.c b/drivers/nfc/fdp/i2c.c index 5e797d5c38ed..712936f5d2d6 100644 --- a/drivers/nfc/fdp/i2c.c +++ b/drivers/nfc/fdp/i2c.c @@ -210,14 +210,14 @@ static irqreturn_t fdp_nci_i2c_irq_thread_fn(int irq, void *phy_id) struct sk_buff *skb; int r; - client = phy->i2c_dev; - dev_dbg(&client->dev, "%s\n", __func__); - if (!phy || irq != phy->i2c_dev->irq) { WARN_ON_ONCE(1); return IRQ_NONE; } + client = phy->i2c_dev; + dev_dbg(&client->dev, "%s\n", __func__); + r = fdp_nci_i2c_read(phy, &skb); if (r == -EREMOTEIO)