From patchwork Fri Dec 23 07:46:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaoqian Lin X-Patchwork-Id: 13080717 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 A946BC4167B for ; Fri, 23 Dec 2022 07:48:48 +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:Subject:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Y8JZ8riXXJVwqeKjKpiIxGAAGX/gYD2YcoYF9d8/YcE=; b=U7i7FPunA5G8k6 KczfN20wlxwUIBrUfiyH5udH2Ht7M15imtRvaoqk5zIjowsAoSujQ/Wpw3osPwBesHBOwHX1PlNMx jYZekKMjO1brSknYTBvEs6XO6+A/lARtbzeJGPcJeMz2rjJ9rze4dbMuZyqiXx+4h4KdpbY/Mqjyg gINHTiuKXlWIp2fEocrdGGq/9LhLHgoEsrX3rEifMmkgTgs7ecAamYN9WS5lIsZc9IDHzDfvpnPKH NXTPq+6qDommqBjhvhfx5M5VdeDnzy+auzMKdae08PQQkTd9xjjqxdx29UU0OhvIvY7ycxl1FSx/5 F3FKfRdtVEfWVPrYD+0Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p8cmP-004v2j-VE; Fri, 23 Dec 2022 07:47:46 +0000 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1p8cmI-004uwG-GV; Fri, 23 Dec 2022 07:47:40 +0000 Received: by mail-pl1-x62a.google.com with SMTP id t2so4302775ply.2; Thu, 22 Dec 2022 23:47:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=YR55G9jjoRMMPsmodTNiLbx+TyjEdvtvdLYurZPfaN8=; b=o2QV5EjfyGwQymBw3MiEVEiXoA9BcDha8F88P5QvkSg0GlCM2Y3uo0JzqLAhVB2s+O 5qOuTNMEdk8y8JioagUG7IRQoJhHf8OrwSSObO+dEW6uLf2W1Dy364CD10Zva7bZ7XGR Epam6lhOQuTDExs/R8NSV4MBwgvfwklMcu+CeR+8fNiQWlKQ/ndaEM4beM402UmSklbj u+KloBT+B8xQ3MqHzzQjZjc265cNLsD7Ra44FsJY9KX0oibk++Rx8yFjfqYR7QercVZv ATEfWNl6c6SK2C/t/azCvRA+uM+zcGMSw34/HXFIxml0c8uTPLw8LjSq4F8+y1dBUFCZ I1ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YR55G9jjoRMMPsmodTNiLbx+TyjEdvtvdLYurZPfaN8=; b=SCxnI5TTjhVObWspW/Mwa7K5jJOw3kLSz3E1hYOhCKcziKp5k6VILvfGRh7OoNz3JZ sOAuLRZK/Cv/4W248MX5Gx+693Hxnjii8B8Fe612gdaIkWC1b5pXNWrwN9D1je5+h1kA MDL7i8y3HNbMr7cGF7Sv489P/Yb7hvAxPvazeKF84BLc5fusrVvZ/BKPRWXehs+GNy+k HC+/5gwJRwgztOzBpwSakXxLG15XHzxa7fD8meRipRnFrdW3LHQZa5pHmZkqItlQciIE a3CSfzgDjP+Xqd6z60mGUv4zuF/pw5yWaNHfaFhWRWTedO/bAK9VqLwThNIDduqPrnHa tCJA== X-Gm-Message-State: AFqh2kot5xBUl2o2Luundb4hUeLJpPpX7qrBQ/ewLm34vuC+HnTKMEmm qlkTaPjmwjk7g56nDSO6gIE= X-Google-Smtp-Source: AMrXdXtL0LpOWA6q8EssuMIA2u9mczls2uCvJtiRIEW/JUe3R3Bcafg4y8eUESEbyyGQJw8FXA++Cg== X-Received: by 2002:a17:90a:ce8d:b0:219:34cb:476c with SMTP id g13-20020a17090ace8d00b0021934cb476cmr9682964pju.9.1671781651605; Thu, 22 Dec 2022 23:47:31 -0800 (PST) Received: from localhost.localdomain ([202.120.234.246]) by smtp.googlemail.com with ESMTPSA id y15-20020a17090ad70f00b00218daa55e5fsm1699552pju.12.2022.12.22.23.47.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Dec 2022 23:47:31 -0800 (PST) From: Miaoqian Lin To: 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: [PATCH v2] input: raspberrypi-ts: Fix refcount leak in rpi_ts_probe Date: Fri, 23 Dec 2022 11:46:53 +0400 Message-Id: <20221223074657.810346-1-linmq006@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221222_234738_590995_69FE690A X-CRM114-Status: GOOD ( 11.54 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 Reviewed-by: Mattijs Korpershoek --- changes in v2: - use devm_rpi_firmware_get(). - remove rpi_firmware_put(). --- 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;