From patchwork Tue Dec 20 16:10:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Lansberry X-Patchwork-Id: 9481753 X-Patchwork-Delegate: sameo@linux.intel.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F39E1606DB for ; Tue, 20 Dec 2016 16:11:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E43AC2841B for ; Tue, 20 Dec 2016 16:11:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D8E9428486; Tue, 20 Dec 2016 16:11:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6AE642841B for ; Tue, 20 Dec 2016 16:11:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764785AbcLTQLv (ORCPT ); Tue, 20 Dec 2016 11:11:51 -0500 Received: from mail-qt0-f180.google.com ([209.85.216.180]:34299 "EHLO mail-qt0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764612AbcLTQLS (ORCPT ); Tue, 20 Dec 2016 11:11:18 -0500 Received: by mail-qt0-f180.google.com with SMTP id n6so181213987qtd.1 for ; Tue, 20 Dec 2016 08:11:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kuvee-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hddHdnK1GZ3KRuU0vinVNGkx1TQpNptTRFPX5bFjmyU=; b=O8te80zDin4QcBkLKqbp1ONS0YT90pnD+lekaJQrL2SwQC+NmHpRMfjj7FnfgbdObI irJH0KYvEpa1H1Sz8ZidjY0YFwkwjNwBACDUFcEcW6rL4w3L8xo9CafBzcHRStYVgqLt U6pbm4CjY5ApQUjn33ZhAfEBvuKYDRaYVbhYsY89H4kJm6Gjspcg0HYH+XaYfzgJ6m0m fpaJFz4jdkUmPknw1KTc2YeUc8FxQkfZI05SjIBzDwGX9+Uive6l8g4NxC5mfpPzk9FT lerGT2BquRfDMHi9HXO4lqdeU9VyfNcY/M8nZ0qun2PGOOZ0F42ZhtQmjhgHpq4cgerT dp/Q== 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=hddHdnK1GZ3KRuU0vinVNGkx1TQpNptTRFPX5bFjmyU=; b=fSAIpp0PAIlMSrBWlt+jngujXRN3pdnB53wCKtkl8G6f1hYOm2VKgRXVYdWZaHAf/F cezdEmKZ2HAgwIVs7s3Il690wRV9LEVwyIuWOgIa3uOFIf+ngnvHvzLqHamWXGEx+EEm q08qkd7/nl4Y/4epHCqtUsJdAb24Far2ekqrgqywEgDkCWo3vX6ahove3fw29sezVra2 QB0hWq1ZGswuadXxmt1gCyoRZ3RQ+7lbFKsX9mBK5Lblz3HOfSIbhSW+jWJ3yd7oIILg zuz8OZHYav32b8mvDDYi/4LFdMvG4brKeF0vgGI5UlW8O7fiR/dHorqRgCFBm9GX79mc P1Hg== X-Gm-Message-State: AIkVDXKzrPGzFXlRD25Nq88KKLS/IDTh3ObXtSYo8dIDYwiZpEAWydfvf0wtvQc1lDWLjQ== X-Received: by 10.237.54.97 with SMTP id e88mr69183qtb.57.1482250272891; Tue, 20 Dec 2016 08:11:12 -0800 (PST) Received: from localhost.localdomain (c-73-119-141-105.hsd1.ma.comcast.net. [73.119.141.105]) by smtp.googlemail.com with ESMTPSA id u7sm13370785qkh.2.2016.12.20.08.11.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Dec 2016 08:11:12 -0800 (PST) From: Geoff Lansberry X-Google-Original-From: Geoff Lansberry To: linux-wireless@vger.kernel.org Cc: lauro.venancio@openbossa.org, aloisio.almeida@openbossa.org, sameo@linux.intel.com, robh+dt@kernel.org, mark.rutland@arm.com, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, mgreer@animalcreek.com, justin@kuvee.com, Jaret Cantu , Geoff Lansberry Subject: [PATCH 3/3] nfc: trf7970a: Prevent repeated polling from crashing the kernel Date: Tue, 20 Dec 2016 11:10:49 -0500 Message-Id: <1482250250-4192-6-git-send-email-glansberry@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482250250-4192-1-git-send-email-glansberry@gmail.com> References: <1482250250-4192-1-git-send-email-glansberry@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jaret Cantu Repeated polling attempts cause a NULL dereference error to occur. This is because the state of the trf7970a is currently reading but another request has been made to send a command before it has finished. The solution is to properly kill the waiting reading (workqueue) before failing on the send. --- drivers/nfc/trf7970a.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c index 8a88195..5916737 100644 --- a/drivers/nfc/trf7970a.c +++ b/drivers/nfc/trf7970a.c @@ -1496,6 +1496,10 @@ static int trf7970a_send_cmd(struct nfc_digital_dev *ddev, (trf->state != TRF7970A_ST_IDLE_RX_BLOCKED)) { dev_err(trf->dev, "%s - Bogus state: %d\n", __func__, trf->state); + if (trf->state == TRF7970A_ST_WAIT_FOR_RX_DATA || + trf->state == TRF7970A_ST_WAIT_FOR_RX_DATA_CONT) + trf->ignore_timeout = + !cancel_delayed_work(&trf->timeout_work); ret = -EIO; goto out_err; }