From patchwork Tue Dec 20 16:16:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Lansberry X-Patchwork-Id: 9481793 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 86EF7606DB for ; Tue, 20 Dec 2016 16:18:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7865A27F82 for ; Tue, 20 Dec 2016 16:18:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6D0A927FA8; Tue, 20 Dec 2016 16:18:02 +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=unavailable 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 2F153206AC for ; Tue, 20 Dec 2016 16:18:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935149AbcLTQRg (ORCPT ); Tue, 20 Dec 2016 11:17:36 -0500 Received: from mail-qt0-f178.google.com ([209.85.216.178]:33340 "EHLO mail-qt0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756954AbcLTQQp (ORCPT ); Tue, 20 Dec 2016 11:16:45 -0500 Received: by mail-qt0-f178.google.com with SMTP id p16so178787273qta.0 for ; Tue, 20 Dec 2016 08:16:44 -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=XOUyaX0bJzpLhgfyO9AXgrzs828EkorOtWrjQyy6SeX9Rl3C7axXadfjGb2eNj0aUx U4MOoIDzDDa/w9r+ncq3/xlb53koEEj+WZAJyfB1bvyUdmQ2/jmjWBYKosfXErdc3Vua neZXxXZz9sR3eBIDZ3UnVHVOTXpuk0YeKumxsW4TgFZZ6QqjrAC24FeS7MS7EVXd/gc3 8OvGGn1ZWsoIInn1TyAlph1Fc47cLZzwY7kMZgbeb3i7yyhWRsFAoMyPWYSV3TwbJz6t P5r9t5yVxEfyna9P9rjWszP20o99aPicHQKciYqKPGx6r8kkanqoGUWEoMDsZlU2vbuY H+Jw== 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=LXLf5lPhUvaF5gohv0g/ZQy+EfPzcWLOnw9dIX1M7LWzT8fzP+lI3HPXxfFPBpeb84 +tSvQCAtrHcEra0OePmyY/Q5UGo2TKsYnho9IL/MUSMpWiSUlTjnSVVtMWnB1n65LFZh pMwCa0kGjdP9noD922nisHTFklqecHJTzt0oIN+a1aC0pWUamJaXi4VHRWV9jnzG8Oxz iAJgdYENuTUAsGEI1PIbRWD2djj10L6onihEOQRy9TDj3GgodPvFgbMHXrXMHZkmtbbo oNad6KmfTnk5AYtE/vrY5cvV/+PvJNCoexBak1rKgGo+VZQZZROUO/j8GbyR3C/IrpPV 9V7Q== X-Gm-Message-State: AIkVDXLidAQVoykLvwA5o8dLTX25b3GV+hA/+TRkovCHxvqJl1O2AgQEvfCEkCYvC+8Qog== X-Received: by 10.237.61.210 with SMTP id j18mr81731qtf.137.1482250604185; Tue, 20 Dec 2016 08:16:44 -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 c2sm13395527qkg.8.2016.12.20.08.16.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Dec 2016 08:16:43 -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:16:32 -0500 Message-Id: <1482250592-4268-3-git-send-email-glansberry@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482250592-4268-1-git-send-email-glansberry@gmail.com> References: <1482250592-4268-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; }