From patchwork Tue Dec 20 11:52:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaoqian Lin X-Patchwork-Id: 13077775 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 6AE4AC4332F for ; Tue, 20 Dec 2022 11:57:04 +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=WcSKOZwtpvmzIenviDx7zOPHS+BbaDS3BzNIOrKTbSQ=; b=iXaTjhkrgJ2A1Y h4dH+Cx/OIebrBxAbbUc9QYjDSdjmFZBC4UFgymeE1RQQP/1CGuBHyR4A9a4ulH8R5zL9xYWEe0rZ m9DgJK9UMdBb4ipn3ARTteqFdxICVkHwJLfVQyaLIWKbQpYvJbzCGDTQsJUzDmDhGYbyQ4WEUwYwL EyrzIu6C/qJI71cWzUWcHnrGTe4svvLv+8TryyjhEoVFM09kcwzJitrfTOsMGfliT4q0CES6jHQ07 dYzWVcQjOUC14DmNgcKUaxL0GpKKlD7UTg8GBpxisJSJQo9J6MqtegPv0pBOmceeW0sj7i/W7VLHW MJXmqT8HxWjVuAigdddg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p7bDh-00E9Pg-Jn; Tue, 20 Dec 2022 11:55:41 +0000 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1p7bB8-00E722-Bv; Tue, 20 Dec 2022 11:53:04 +0000 Received: by mail-pj1-x1033.google.com with SMTP id t11-20020a17090a024b00b0021932afece4so16202618pje.5; Tue, 20 Dec 2022 03:53:01 -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=Lso547JX5vTY2uG06uoFIFztgpYecJYWXqOFJKfCq9A=; b=NZBmBWT0pXX5TaRDccE1wmua0oWib2GxgHdFapwRZJovA6yEJLwSuHqnjdnlGzvdFx sbJoX6yb8Ubb1qa/54JSFrn8/KVPrk6Zgz6ksxwgK7Hge+QQx4JOp44XYTbyOv7c4QrN 9dmddS+pG07psJp1LojSHEDz6xCj+gviFXyTAPvuGbyard1kB/iP+sfVUeNMN05dsEKw a4LoQ/J+rOjMQgkXk7qHVIwsgnkqkVeZENxlDA/NMfH20WJ9u/+M3Di90NUfk9/r76RN 6+MJ9C/BG2GMl8fCxkMRohgwfz6z8QRM3msAgJv1RLsrde9Niq4pBZ11iPtgjvhGD3BP BX6A== 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=Lso547JX5vTY2uG06uoFIFztgpYecJYWXqOFJKfCq9A=; b=Lq3EDqwp+2SdAq0cBzAWZVxCsO4LY+os+e16w/CQtVaUFnmTQPo3PYPYO3iPREbLS5 KSA65z+PDDdKbZ4Ktdu8geFuQjrhwrj6b1gF0LHDe0r8vrUVi+mZ+NEYPHkvTSpwFCWY jYiuI9pGwXTqabO6HOvk+czWqvjfMGGLbodnup6zO8c0jR3OvAuZHFiE7zG7Z8cHooW5 eZgAp2o9LArB19FV3h0/edCXNxhSsTXxalIVa7hWIB2KYRVK0Dg6Av1S4BoIud9mw9xY dZlVppFGi9zK8id6JvaEZ+Xt3Y0yEz/Juny2/xUnH1vdjB/RTEUIx04tC+3d8vdQOsTG Nijg== X-Gm-Message-State: ANoB5pkQRS0+JNJz6lh7H72wqauU0vY2Ky8a6tNfqn5ZMeCPFwvI3FjC eicPpMSvCCHVh+91U5vLp9oV95d6yai3gfjK X-Google-Smtp-Source: AA0mqf74eIrv2LcbZ4UdOuZq35RVyjX2oL4FLp5h/Guu7OQyM9gJa2Y4Kvx4rn4wBkEUJM22lye9Ug== X-Received: by 2002:a17:903:515:b0:189:ec2d:89c0 with SMTP id jn21-20020a170903051500b00189ec2d89c0mr46662475plb.59.1671537180573; Tue, 20 Dec 2022 03:53:00 -0800 (PST) Received: from localhost.localdomain ([202.120.234.246]) by smtp.googlemail.com with ESMTPSA id j5-20020a170902c3c500b00172fad607b3sm9140276plj.207.2022.12.20.03.52.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 03:52:59 -0800 (PST) From: Miaoqian Lin To: Dmitry Torokhov , Florian Fainelli , Broadcom internal kernel review list , Miaoqian Lin , Rob Herring , Nicolas Saenz Julienne , Eric Anholt , linux-input@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] input: raspberrypi-ts: Fix refcount leak in rpi_ts_probe Date: Tue, 20 Dec 2022 15:52:43 +0400 Message-Id: <20221220115246.1522054-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-20221220_035302_701171_85127DA5 X-CRM114-Status: GOOD ( 13.23 ) 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. Add missing rpi_firmware_put() in the error handling to fix it. 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 --- drivers/input/touchscreen/raspberrypi-ts.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/input/touchscreen/raspberrypi-ts.c b/drivers/input/touchscreen/raspberrypi-ts.c index 5000f5fd9ec3..114237c76378 100644 --- a/drivers/input/touchscreen/raspberrypi-ts.c +++ b/drivers/input/touchscreen/raspberrypi-ts.c @@ -140,21 +140,24 @@ static int rpi_ts_probe(struct platform_device *pdev) return -EPROBE_DEFER; ts = devm_kzalloc(dev, sizeof(*ts), GFP_KERNEL); - if (!ts) - return -ENOMEM; + if (!ts) { + error = -ENOMEM; + goto err_put_fw; + } ts->pdev = pdev; ts->fw_regs_va = dma_alloc_coherent(dev, PAGE_SIZE, &ts->fw_regs_phys, GFP_KERNEL); if (!ts->fw_regs_va) { dev_err(dev, "failed to dma_alloc_coherent\n"); - return -ENOMEM; + error = -ENOMEM; + goto err_put_fw; } error = devm_add_action_or_reset(dev, rpi_ts_dma_cleanup, ts); if (error) { dev_err(dev, "failed to devm_add_action_or_reset, %d\n", error); - return error; + goto err_put_fw; } touchbuf = (u32)ts->fw_regs_phys; @@ -206,6 +209,10 @@ static int rpi_ts_probe(struct platform_device *pdev) } return 0; + +err_put_fw: + rpi_firmware_put(fw); + return error; } static const struct of_device_id rpi_ts_match[] = {