From patchwork Thu Sep 28 09:58:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinjie Ruan X-Patchwork-Id: 145921 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3200460vqu; Thu, 28 Sep 2023 03:12:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFrI7WXCbdBfELTa9JnWtqa4vNR9HK/4UUXjfs+FyK5HI3VvFAMKZzfF1vzTInzFgpzcZ7X X-Received: by 2002:a05:6a20:8e10:b0:128:ffb7:dcfe with SMTP id y16-20020a056a208e1000b00128ffb7dcfemr1317968pzj.1.1695895961486; Thu, 28 Sep 2023 03:12:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695895961; cv=none; d=google.com; s=arc-20160816; b=WuBO5eTdhpsLobwiCVfsvxaKE4jxVZZjwt6X+ZawkuBYzT5W1X/0qcOzKKPm8lDqSB D+lMUuNHF2Y5VV+FjKnViM7rSRDKfvMZY3d5N8QgrzRRsQbGnAhmStfQRRKT6KHsvqZm aThY70cPvv3mcNWjSJgW4HnGRpwL9x7hljQhkb2CZiHo8ghe6QfUPgy90dJj9kk3y0Yr H+xYxsqVOzc2Dcrttk9LRWbMAQ7CNvePftW98bDPTKjiGfZUiT1C7JRfWQDiqwOfcd3C XmHEXgekLkgSI9KV1IN2vgUyqxDzm9PrIFSdbvf+01NqHBUcE4a2HUcu3RfFG7BLt4ap waPg== 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 :message-id:date:subject:cc:to:from; bh=9OUa2Lbta8nINgFzbKXVO3wDgmgBgC1Pp0yG+iT/Zv0=; fh=yxx2afqvYOxYzO3f8VcgVYxr10oOze4JGJRXAhpyIl8=; b=Q4ywj3Y2e4BEongKXdys+rCm+YtX7T7mO6ESg2uGQSlHlhBnqqbj9kltoAp6RDtdr7 BW5XFf46V7CeUFG3+313n4s4mMzFXSzAof/jdFSSl8c7brYGeaIJIHD7XNgef5dq46C1 TdiTWrchOISJE2tfj0Y6Ll6qZBF779Y1kh8cxKySEeJseSjXArZcXaJ2z7xoi4R/yURw pcYNuhhy14bFARXmIFqgekYQOvTV6F2cBUZdL/YZDZjJOOVmVQgSZJLq1tAM+52lUXd0 37TNVGRpLeFDaaeWVwGGUCYs0KoFcteceNbMVzG/eMpylHaNhnBiLnwE4uGN3gI+InBF MmMw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id bz33-20020a056a02062100b0056531bfc660si20360101pgb.143.2023.09.28.03.12.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 03:12:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id DACD7801BEAC; Thu, 28 Sep 2023 02:59:04 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230293AbjI1J6x (ORCPT + 21 others); Thu, 28 Sep 2023 05:58:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230119AbjI1J6v (ORCPT ); Thu, 28 Sep 2023 05:58:51 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4AA4E122; Thu, 28 Sep 2023 02:58:49 -0700 (PDT) Received: from kwepemi500008.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4Rx85B3ZGDz15NKB; Thu, 28 Sep 2023 17:56:30 +0800 (CST) Received: from huawei.com (10.90.53.73) by kwepemi500008.china.huawei.com (7.221.188.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Thu, 28 Sep 2023 17:58:46 +0800 From: Jinjie Ruan To: , , Moritz Fischer , Wu Hao , Xu Yilun , Tom Rix , Russ Weight CC: Subject: [PATCH] fpga: bridge: Fix possible memory leak in fpga_bridge_register() Date: Thu, 28 Sep 2023 17:58:18 +0800 Message-ID: <20230928095818.1297547-1-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.90.53.73] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemi500008.china.huawei.com (7.221.188.139) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 28 Sep 2023 02:59:04 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778275803507403451 X-GMAIL-MSGID: 1778275803507403451 If device_register() fails in fpga_bridge_register(), the bridge allocated by kzalloc() and the id allocated by ida_alloc() also need be freed otherwise will cause memory leak. Fixes: 0d70af3c2530 ("fpga: bridge: Use standard dev_release for class driver") Signed-off-by: Jinjie Ruan --- drivers/fpga/fpga-bridge.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c index a024be2b84e2..4a298656ce77 100644 --- a/drivers/fpga/fpga-bridge.c +++ b/drivers/fpga/fpga-bridge.c @@ -370,15 +370,15 @@ fpga_bridge_register(struct device *parent, const char *name, goto error_device; ret = device_register(&bridge->dev); - if (ret) { - put_device(&bridge->dev); - return ERR_PTR(ret); - } + if (ret) + goto error_put_device; of_platform_populate(bridge->dev.of_node, NULL, NULL, &bridge->dev); return bridge; +error_put_device: + put_device(&bridge->dev); error_device: ida_free(&fpga_bridge_ida, id); error_kfree: