From patchwork Mon Oct 24 11:31:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9393 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp478270wru; Mon, 24 Oct 2022 07:17:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4eP0zzXDtQfCvnQiCc/E0VpW/3r/wymjWFnAilZbctSll2KDmvEkQ8rw7qjvcR4d3nEhTp X-Received: by 2002:a50:e616:0:b0:461:fc07:b630 with SMTP id y22-20020a50e616000000b00461fc07b630mr681048edm.219.1666621024666; Mon, 24 Oct 2022 07:17:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666621024; cv=none; d=google.com; s=arc-20160816; b=Eugge/FWhOyidGITzIScLEHNWlsV1+cMCaENFN1KOzRwVx9tPEojDoC4IAFSaGTJgH oVuboy0RzYz6Vhn4kOwiZKxC+9Idkv5ZOt0jYOxx/1MRlVRuZ3L+acB9s1LZLJLX/F8D 9qB2x0JCniklxUjprhhD0fw1Lszvw/ZVsFbqT6GcNU8UUmwqv3RlHXo0eJGZYrIKOLJK KVPddEdLC+2hRreJYtj0cuS8Nal68Be0oOxXRK4w2mePbhEvRNWzaO9Mk3GD1jfBXGN5 hT8ofz8CkbTNN5vVpla520LDzpCVDFvtQl8mRF0OnXa834103Vj8EyuqluypCrMCXtnz C2pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=glPQw33oAPjdyrmncAa8zN2smnK363m0ZbdBgvD47gM=; b=fNDFAqaUu5xmjnpEsxhC4QpBsThUt4ehS8G85Zk8q/SXRc3NVuSXFH7J7B0iQbOIH4 d/UKNfYJ6dSIzZVEf6Mybavqj1cMeBYS3OlA+3XvXwWayVkN8yQdQfzGUjFT8mS0b3bi sKejKDgbkRgafCEvQvmx0GFa6Cpi8q9IQaCdQ8wEzUECEf7QpGcriv+Z1weH26cJi51j DlpAyY6tlXmRs2BZznbqXa7YXVu3tYIVeWSh3rSSxJJYOdS0pSoSU/VF0GyHFpzY/ro2 bImJrhJOwieC4Nh8bmPwa0OmXPjf/IxORzFuDquZfc9cJSXMVRgvC2bJ7f/1aeSI/AAA u3uA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1Z2wo+4u; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sc11-20020a1709078a0b00b0078d8db64fffsi27505030ejc.20.2022.10.24.07.16.40; Mon, 24 Oct 2022 07:17:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1Z2wo+4u; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232975AbiJXOGv (ORCPT + 99 others); Mon, 24 Oct 2022 10:06:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236212AbiJXOC7 (ORCPT ); Mon, 24 Oct 2022 10:02:59 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7572C0997; Mon, 24 Oct 2022 05:48:46 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 51A08612B4; Mon, 24 Oct 2022 12:48:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 64312C433C1; Mon, 24 Oct 2022 12:48:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615718; bh=WDyOXrbFl1uJd00F4JRhGGH67hz1LHgixA315HYy2mI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1Z2wo+4u60gkC0ziDgX8NdFYLaAwkLmPoRFHwRfvdlDnc2vJtDPvvze/WkJOUFmqs RdxrJXXkfWIoxM0nJN/0j5j0IeEBDNtBxKJL4QY39BlFtVMJyfbCSi3dmKgOdrfU6w iAzICO8P/m9vtStRXxCOlP+/BujjI7I/YT49gH5M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lin Yujun , Stephen Boyd , Sasha Levin Subject: [PATCH 5.15 356/530] clk: imx: scu: fix memleak on platform_device_add() fails Date: Mon, 24 Oct 2022 13:31:40 +0200 Message-Id: <20221024113101.141484836@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747578807475490475?= X-GMAIL-MSGID: =?utf-8?q?1747578807475490475?= From: Lin Yujun [ Upstream commit 855ae87a2073ebf1b395e020de54fdf9ce7d166f ] No error handling is performed when platform_device_add() fails. Add error processing before return, and modified the return value. Fixes: 77d8f3068c63 ("clk: imx: scu: add two cells binding support") Signed-off-by: Lin Yujun Link: https://lore.kernel.org/r/20220914033206.98046-1-linyujun809@huawei.com Signed-off-by: Stephen Boyd Signed-off-by: Sasha Levin --- drivers/clk/imx/clk-scu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/clk/imx/clk-scu.c b/drivers/clk/imx/clk-scu.c index 083da31dc3ea..dc933fd5d5a0 100644 --- a/drivers/clk/imx/clk-scu.c +++ b/drivers/clk/imx/clk-scu.c @@ -690,7 +690,11 @@ struct clk_hw *imx_clk_scu_alloc_dev(const char *name, pr_warn("%s: failed to attached the power domain %d\n", name, ret); - platform_device_add(pdev); + ret = platform_device_add(pdev); + if (ret) { + platform_device_put(pdev); + return ERR_PTR(ret); + } /* For API backwards compatiblilty, simply return NULL for success */ return NULL;