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 5C817C25B4E for ; Tue, 24 Jan 2023 10:15:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232430AbjAXKPw (ORCPT ); Tue, 24 Jan 2023 05:15:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230202AbjAXKPv (ORCPT ); Tue, 24 Jan 2023 05:15:51 -0500 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56C553CE2E for ; Tue, 24 Jan 2023 02:15:50 -0800 (PST) Received: by mail-wm1-x333.google.com with SMTP id o17-20020a05600c511100b003db021ef437so10523756wms.4 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=YaSlSlWSJyRIxROUGPSLS39ORZLALwe7nPoy7FcNTcnchdpLvBw3bLdnTpchM0eLiy V/R65rx61h7t0609+/dVadXMeVKXebDAGDHhPudNKyTEQ7wzfF2h5IrpISR2r7HHyyqj wrA56osWvAah/GjfABRz15Tspa25pPL8lVzPls0tzEnSD4X2w3Zo/x1L/JFntMQ1n8Bd 1noMSZ3StI7eLdwFWB/vA62TJQwQrEgJbI5ZGpX7kd3JT6nTu/rX+0TXDwlftDTyglCV uTH7WL5JOCO4wdiGMJodxIsI9Ec564lDJamcH3ihPsgCUY/r+oamBIOefTANEXkSc2b9 GrPg== X-Gm-Message-State: AFqh2kop3adXFFt2RZdY5BXW0iJCyTPZTtmTMsd6S70wkiyiI5bOYMYj GEsqdtxk+yUdJh3g51v7/MGjrw== 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-input@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