From patchwork Wed Mar 29 16:21:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 9651923 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 C04E7601D7 for ; Wed, 29 Mar 2017 16:23:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B3E1B28482 for ; Wed, 29 Mar 2017 16:23:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A8A20284D6; Wed, 29 Mar 2017 16:23:59 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 3F77E28482 for ; Wed, 29 Mar 2017 16:23:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754540AbdC2QXS (ORCPT ); Wed, 29 Mar 2017 12:23:18 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:34738 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932138AbdC2QV5 (ORCPT ); Wed, 29 Mar 2017 12:21:57 -0400 Received: by mail-lf0-f68.google.com with SMTP id x137so2166344lff.1; Wed, 29 Mar 2017 09:21:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=uUrVQkb+ZwHkLoaVtxvcIr2P2Qzfl7V4hN6u+UnxusQ=; b=Fp60ruRZJgcL1b4dsUCX46xc/1SG4h5k38dpI0osTG3qGjlAg2Ys+6aAAzdnmK7/KP zeRAeznhVSu58Jfw2f9NNBcR4zwE7Yna+kkpNmfE4xNuf8mT0EFGJwgVsYvfMHXCnw0E PUW9qeMzF5x8sWFuhD9Byml7cH41V7S5SZaQ30UlBRPETg1CBgRv8AznfuFsxyvb2kh8 SyvFr69JYHa3J2JaWTXWtmrvgjMRPRqeIUrDRGdkpoGwUlX4vsAy0hH0SyljeuprbvJL ueOdoTk+K4CU/NvrYa39jDf2YWDkDt6xt6p946Xif+U3a5D81BIpCG5wSfNNdIcB5Lds O3YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=uUrVQkb+ZwHkLoaVtxvcIr2P2Qzfl7V4hN6u+UnxusQ=; b=dV5ioAfMwGVwW6sXUuFbeEKFORyMvwKU1H6c6VIX258k43xVgy5u6YD8bMa7e8bsN6 KzcWcmYX4aSoYOR+GDultF8dbmMIz8ge8ceatfayrDIMoRZeIRUrlYdtDQCqHo+J4Oa7 yid0MvDI3a6KIYoGUl25lrNOli42ePJNMY5DXro7oFEddbW64fp9Dw01VNWKC1p8NX5m d6ky1dmjJonAprfQsZU5Wd62dZovLCHru1uzFf6DufpchS9835K/YnlFA8RmXPJ6ufqX LZBHvfFE8cUvaRxDVkaEq8JtsBZj2fkfmQWt3Yd7zKSwDtM5kiJXxdH71ynKeRIvb/nv C8tA== X-Gm-Message-State: AFeK/H0FMweb30zkck9rA1IOoqu4Nj3Dh/pQep1pzV5xqhUwyhvfjkaItmOIvMmG40AQWg== X-Received: by 10.46.76.17 with SMTP id z17mr507675lja.62.1490804515224; Wed, 29 Mar 2017 09:21:55 -0700 (PDT) Received: from xi.terra ([84.216.234.102]) by smtp.gmail.com with ESMTPSA id v26sm1396017lja.31.2017.03.29.09.21.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Mar 2017 09:21:53 -0700 (PDT) Received: from johan by xi.terra with local (Exim 4.89) (envelope-from ) id 1ctGM0-0004jK-Uv; Wed, 29 Mar 2017 18:21:48 +0200 From: Johan Hovold To: Lauro Ramos Venancio , Aloisio Almeida Jr , Samuel Ortiz Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable , Vincent Cuissard Subject: [PATCH 3/7] NFC: nfcmrvl: do not use device-managed resources Date: Wed, 29 Mar 2017 18:21:08 +0200 Message-Id: <20170329162112.18121-4-johan@kernel.org> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170329162112.18121-1-johan@kernel.org> References: <20170329162112.18121-1-johan@kernel.org> 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 This specifically fixes a NULL-pointer dereference when using the n_nci line discipline on one end of a Unix98 pty as well as resource leaks in the registration error paths. Device-managed resources is a bad fit for this driver as devices can be registered from the n_nci line discipline. Firstly, a tty may not even have a corresponding device (should it be part of a Unix98 pty) something which would lead to a NULL-pointer dereference when registering resources. Secondly, if the tty has a class device, its lifetime exceeds that of the line discipline, which means that resources would leak every time the line discipline is closed (or if registration fails). Currently, the devres interface was only being used to request a reset gpio despite the fact that it was already explicitly freed in nfcmrvl_nci_unregister_dev() (along with the private data), something which also prevented the resource leak at close. Fixes: b2fe288eac72 ("NFC: nfcmrvl: free reset gpio") Fixes: 4a2b947f56b3 ("NFC: nfcmrvl: add chip reset management") Cc: stable # 4.2: b2fe288eac72 Cc: Vincent Cuissard Signed-off-by: Johan Hovold --- drivers/nfc/nfcmrvl/main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c index 51c8240a1672..8d4294fc3005 100644 --- a/drivers/nfc/nfcmrvl/main.c +++ b/drivers/nfc/nfcmrvl/main.c @@ -124,10 +124,9 @@ struct nfcmrvl_private *nfcmrvl_nci_register_dev(enum nfcmrvl_phy phy, memcpy(&priv->config, pdata, sizeof(*pdata)); if (priv->config.reset_n_io) { - rc = devm_gpio_request_one(dev, - priv->config.reset_n_io, - GPIOF_OUT_INIT_LOW, - "nfcmrvl_reset_n"); + rc = gpio_request_one(priv->config.reset_n_io, + GPIOF_OUT_INIT_LOW, + "nfcmrvl_reset_n"); if (rc < 0) nfc_err(dev, "failed to request reset_n io\n"); } @@ -195,7 +194,7 @@ void nfcmrvl_nci_unregister_dev(struct nfcmrvl_private *priv) nfcmrvl_fw_dnld_deinit(priv); if (priv->config.reset_n_io) - devm_gpio_free(priv->dev, priv->config.reset_n_io); + gpio_free(priv->config.reset_n_io); nci_unregister_device(ndev); nci_free_device(ndev);