From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D3E0C54EAA for ; Tue, 24 Jan 2023 10:15:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232676AbjAXKPx (ORCPT ); Tue, 24 Jan 2023 05:15:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55708 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229802AbjAXKPv (ORCPT ); Tue, 24 Jan 2023 05:15:51 -0500 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 547C52B614 for ; Tue, 24 Jan 2023 02:15:50 -0800 (PST) Received: by mail-wm1-x335.google.com with SMTP id k16so11025779wms.2 for ; Tue, 24 Jan 2023 02:15:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=mime-version:message-id:date:references:in-reply-to:subject:to:from :from:to:cc:subject:date:message-id:reply-to; bh=8un66zLwO3rwD/g45VoCRqCtHHjJIgDrgaIv4nHBGpE=; b=5IzoJ/Bo+JeI4g40vilzNuB+88HZ/EY6bz6sZzs5cuM8K3Z4Jag+2N+Bt9AH1ZDhTs wTd1EpkTQNdqmImQ5tjSPfe/5WpGGQCx/vE/eN6pF/CgzysDahv0gn/vAbORoZno+AHg lUfo5jRmwW2PhE7+z8HMDAMpPxiF6mA4Uxc/Vp4ybinBds0zTCEzMRaBhZfVfs7g4fRI KjZxBHqVLv8OodHM4I2P7bBxipJCN5n/ojhaZjmYZTpVEnKjVjJGQr4BSw6s1J3NB6pu DKQckZDidtxrIUoM/j8IumK5yd2uDp/LBgfT2Hnmfnehbvg1MCGda+h/++crN2fXSn/W loFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:date:references:in-reply-to:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=8un66zLwO3rwD/g45VoCRqCtHHjJIgDrgaIv4nHBGpE=; b=rAfxDUL6MzMP+X9YeFrHwfFMi0mxcCxMgkJ9+ZEu/PmwlOXttms6aynoStX4bwDacr jGGN9Npg5EhG4C+UR0MgT0GCIg5Uq75zBlckH6rhOWZCv7TxI9H1eic8FCwuFR/80Aiv Uc8Zdl3d9rjWKSBaZUGtg/2nVtSGkEE190JY0a87LnKoEENUG34S4LhuDHpXqFM6YMT+ ETkgiRkz5TE7iZBfBiEDbI0vYJhBr6REfMclsckFf6wTGFrLbXzy8p7AORYIdEZpHEFD cUzpDnDUp/naeSQefYqgBNU74CCXDEVLnRv3alXo6LR15U5MNE1kKVkF0frTEgyaCyHd xsGg== X-Gm-Message-State: AFqh2koVBX7SDcSPZnPCpx0M18v/K95hrkP12CB3eucTFaCgFhuL0KxN ndBbXNGr/29HmDy36yl+wtyhJg== X-Google-Smtp-Source: AMrXdXtQiMObKKnyrAyRqjP0D7+AWlOOZakV4ioA/j5cJIYDShX8yJFxBIZJDH9OEpfYy+gS2u1A8A== X-Received: by 2002:a05:600c:46cb:b0:3db:1afd:ac45 with SMTP id q11-20020a05600c46cb00b003db1afdac45mr22087623wmo.7.1674555348765; Tue, 24 Jan 2023 02:15:48 -0800 (PST) Received: from localhost ([82.66.159.240]) by smtp.gmail.com with ESMTPSA id g10-20020a05600c310a00b003d99da8d30asm14069634wmo.46.2023.01.24.02.15.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 02:15:48 -0800 (PST) From: Mattijs Korpershoek To: Miaoqian Lin , Dmitry Torokhov , Florian Fainelli , Broadcom internal kernel review list , Miaoqian Lin , Rob Herring , Eric Anholt , Nicolas Saenz Julienne , linux-input@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] input: raspberrypi-ts: Fix refcount leak in rpi_ts_probe In-Reply-To: <20221223074657.810346-1-linmq006@gmail.com> References: <20221223074657.810346-1-linmq006@gmail.com> Date: Tue, 24 Jan 2023 11:15:47 +0100 Message-ID: <87zga81bn0.fsf@baylibre.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Dec 23, 2022 at 11:46, Miaoqian Lin wrote: > rpi_firmware_get() take reference, we need to release it in error paths > as well. Use devm_rpi_firmware_get() helper to handling the resources. > Also remove the existing rpi_firmware_put(). > > Fixes: 0b9f28fed3f7 ("Input: add official Raspberry Pi's touchscreen driver") > Fixes: 3b8ddff780b7 ("input: raspberrypi-ts: Release firmware handle when not needed") > Signed-off-by: Miaoqian Lin > --- > changes in v2: > - use devm_rpi_firmware_get(). > - remove rpi_firmware_put(). Reviewed-by: Mattijs Korpershoek > --- > drivers/input/touchscreen/raspberrypi-ts.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/input/touchscreen/raspberrypi-ts.c b/drivers/input/touchscreen/raspberrypi-ts.c > index 5000f5fd9ec3..45c575df994e 100644 > --- a/drivers/input/touchscreen/raspberrypi-ts.c > +++ b/drivers/input/touchscreen/raspberrypi-ts.c > @@ -134,7 +134,7 @@ static int rpi_ts_probe(struct platform_device *pdev) > return -ENOENT; > } > > - fw = rpi_firmware_get(fw_node); > + fw = devm_rpi_firmware_get(&pdev->dev, fw_node); > of_node_put(fw_node); > if (!fw) > return -EPROBE_DEFER; > @@ -160,7 +160,6 @@ static int rpi_ts_probe(struct platform_device *pdev) > touchbuf = (u32)ts->fw_regs_phys; > error = rpi_firmware_property(fw, RPI_FIRMWARE_FRAMEBUFFER_SET_TOUCHBUF, > &touchbuf, sizeof(touchbuf)); > - rpi_firmware_put(fw); > if (error || touchbuf != 0) { > dev_warn(dev, "Failed to set touchbuf, %d\n", error); > return error; > -- > 2.25.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9CC11C38142 for ; Tue, 24 Jan 2023 10:16:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:References :In-Reply-To:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bVIkM5bRBMcMtd98Fp0dxJuU5sX+sR1z6eKiq+ewvCo=; b=buQ1ejbKWbo0kY mNyDpPUqe5Db9BtP1YCiL/9PV7DEBwnvTaFc73lMmaiOJamv89v9HwfGxG3ecAxnh+aa/hSZBf1kB CITAC7yO/FBMPWk+5fmjJqBL749YOgYoquX8Z2TMreT/fY171DPPTBhhYROSsZgh84AIZ4BaSUL5j ArMIdfnmnoLQKvbV+PuN3yEepF1xqCAsd5dvVA7GyhNOqAWwexp+jMBwyaI/h3CsTa+bM3GkKMLWK bhNFzAkfWoVGQSD8Owexkhy6VSibOWzxTFLjCJBTNwCftXW8MFx4KblW9wcmr4wwCKjFwOOp7meut wr6hfi/Vj/J8I8pjk/Pw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKGLL-00351f-MO; Tue, 24 Jan 2023 10:15:56 +0000 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKGLG-0034yj-DL for linux-arm-kernel@lists.infradead.org; Tue, 24 Jan 2023 10:15:51 +0000 Received: by mail-wm1-x32b.google.com with SMTP id fl11-20020a05600c0b8b00b003daf72fc844so12472852wmb.0 for ; Tue, 24 Jan 2023 02:15:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=mime-version:message-id:date:references:in-reply-to:subject:to:from :from:to:cc:subject:date:message-id:reply-to; bh=8un66zLwO3rwD/g45VoCRqCtHHjJIgDrgaIv4nHBGpE=; b=5IzoJ/Bo+JeI4g40vilzNuB+88HZ/EY6bz6sZzs5cuM8K3Z4Jag+2N+Bt9AH1ZDhTs wTd1EpkTQNdqmImQ5tjSPfe/5WpGGQCx/vE/eN6pF/CgzysDahv0gn/vAbORoZno+AHg lUfo5jRmwW2PhE7+z8HMDAMpPxiF6mA4Uxc/Vp4ybinBds0zTCEzMRaBhZfVfs7g4fRI KjZxBHqVLv8OodHM4I2P7bBxipJCN5n/ojhaZjmYZTpVEnKjVjJGQr4BSw6s1J3NB6pu DKQckZDidtxrIUoM/j8IumK5yd2uDp/LBgfT2Hnmfnehbvg1MCGda+h/++crN2fXSn/W loFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:date:references:in-reply-to:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=8un66zLwO3rwD/g45VoCRqCtHHjJIgDrgaIv4nHBGpE=; b=zwQ98mIeQL74VlppD7Q0bbc/jAP4rzsGRrUtBiukt5LdoyMUnsrkkOo5gxGc7q3bLK jG4AjO/vCjMadpme3biCD+/To21MgFkfHsLWKJdkf/pugNKPxzwohkexaFrvTvAue52R 0BgaN4AVe+aAL/2zn1M3K/tE3/tnBc+1yc7faz62oSz/efgLU65QDfxTxd/gxS86O1fZ wo/6X7qAmwtm9MHQFRexKU3zMIYOlhU4/rUnvbYI+8JCsVzTQESS9qRIAPhm+biGwu+T 4d8BfYNV7LVKg3ISoyqUjOTasSvBvpFFB8VT3OmrCEyAZEIO0uZs1vYVT6Hpc1khG4ZA thPQ== X-Gm-Message-State: AFqh2kpsDx2eBzBn+emLjVJB3q3xK2XmvQz5PJMPAiIFmDDNsgpiBosq xAH9smkrW+q7tIOlbAARTn7Qww== X-Google-Smtp-Source: AMrXdXtQiMObKKnyrAyRqjP0D7+AWlOOZakV4ioA/j5cJIYDShX8yJFxBIZJDH9OEpfYy+gS2u1A8A== X-Received: by 2002:a05:600c:46cb:b0:3db:1afd:ac45 with SMTP id q11-20020a05600c46cb00b003db1afdac45mr22087623wmo.7.1674555348765; Tue, 24 Jan 2023 02:15:48 -0800 (PST) Received: from localhost ([82.66.159.240]) by smtp.gmail.com with ESMTPSA id g10-20020a05600c310a00b003d99da8d30asm14069634wmo.46.2023.01.24.02.15.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 02:15:48 -0800 (PST) From: Mattijs Korpershoek To: Miaoqian Lin , Dmitry Torokhov , Florian Fainelli , Broadcom internal kernel review list , Miaoqian Lin , Rob Herring , Eric Anholt , Nicolas Saenz Julienne , linux-input@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] input: raspberrypi-ts: Fix refcount leak in rpi_ts_probe In-Reply-To: <20221223074657.810346-1-linmq006@gmail.com> References: <20221223074657.810346-1-linmq006@gmail.com> Date: Tue, 24 Jan 2023 11:15:47 +0100 Message-ID: <87zga81bn0.fsf@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230124_021550_492628_696D6FD6 X-CRM114-Status: GOOD ( 18.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Dec 23, 2022 at 11:46, Miaoqian Lin wrote: > rpi_firmware_get() take reference, we need to release it in error paths > as well. Use devm_rpi_firmware_get() helper to handling the resources. > Also remove the existing rpi_firmware_put(). > > Fixes: 0b9f28fed3f7 ("Input: add official Raspberry Pi's touchscreen driver") > Fixes: 3b8ddff780b7 ("input: raspberrypi-ts: Release firmware handle when not needed") > Signed-off-by: Miaoqian Lin > --- > changes in v2: > - use devm_rpi_firmware_get(). > - remove rpi_firmware_put(). Reviewed-by: Mattijs Korpershoek > --- > drivers/input/touchscreen/raspberrypi-ts.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/input/touchscreen/raspberrypi-ts.c b/drivers/input/touchscreen/raspberrypi-ts.c > index 5000f5fd9ec3..45c575df994e 100644 > --- a/drivers/input/touchscreen/raspberrypi-ts.c > +++ b/drivers/input/touchscreen/raspberrypi-ts.c > @@ -134,7 +134,7 @@ static int rpi_ts_probe(struct platform_device *pdev) > return -ENOENT; > } > > - fw = rpi_firmware_get(fw_node); > + fw = devm_rpi_firmware_get(&pdev->dev, fw_node); > of_node_put(fw_node); > if (!fw) > return -EPROBE_DEFER; > @@ -160,7 +160,6 @@ static int rpi_ts_probe(struct platform_device *pdev) > touchbuf = (u32)ts->fw_regs_phys; > error = rpi_firmware_property(fw, RPI_FIRMWARE_FRAMEBUFFER_SET_TOUCHBUF, > &touchbuf, sizeof(touchbuf)); > - rpi_firmware_put(fw); > if (error || touchbuf != 0) { > dev_warn(dev, "Failed to set touchbuf, %d\n", error); > return error; > -- > 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel