Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp456289rwb; Thu, 10 Nov 2022 03:17:07 -0800 (PST) X-Google-Smtp-Source: AMsMyM6065TMtEg08W0HzxiFCEc9qsfwXI4ZdscOyXmadPevmG4z2bXoHsKMd6vurTN0GgRjqeOk X-Received: by 2002:a17:906:d10d:b0:7ad:b7c2:a2f7 with SMTP id b13-20020a170906d10d00b007adb7c2a2f7mr2719435ejz.227.1668079027534; Thu, 10 Nov 2022 03:17:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668079027; cv=none; d=google.com; s=arc-20160816; b=rtK7KuATsueZT1a++FIkEK3UIqq5B0m0CCBD90HmBDmiQDeqHFR915ZwZzMkxkRkUm LxmBAYfTUsQtkSVw7kPR5RUY3bqefCsejq7MSqh3/HmG1xNv2VaFtXCgD5Pn9DAVDpBB NkDLazlUiiM+Dd7BvvB18K9GnuMHoMnJS3ngjnD0sbEjUX8uSjE3JXZK1RRl8fnO0NLy Wee+tctx7FPfG9PJoSvyi6JBhbzN1WBFnp8/6SYq9gTvN0mxvDBNylMOH8IzxTUvRXqx o8GIVx1L+Z3RLAsZYnve7p0nMKTsox7kVCfWzIViu3I4bjgen9EbeI8jxjcRPDfR+7ly tnbw== 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=KJFAYdBHgMgENF8/CyT7phwpwzj9GbIYE9WJDCG9gdc=; b=StE/8j477NiwDEq/j9NpZx/qGW0RYdIaCuIjYxc3zuceRmo6ambPY2YILMOodE4Ei5 nxyVCJ4jJMqgDHeDj7grGs9ZJWzFSzUId2b+Oi/c/iXBzqwCq2svgwFRs0+bN5lfw/o7 QfLtzTFPtdmtkot4uCUQA7nkgBVp4G5dVL69JXsl0X3Wy7aRI4/pG8wRLDQY6VRBBbC1 Y6wjM6rJOghvYGAuHrRoKiBvRhltoeGbfCZ/5glkE5em/StQBf57C9+Pe6USmAaSQDT0 /HR8+aSM/QC8K8PjqX/AmSIpUPoCWmpli0tzBqoBzSlNTDGP2px2YhEAb7EgRicm4O1+ 9VCA== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m17-20020a056402511100b0045cfb63a033si22283039edd.551.2022.11.10.03.16.44; Thu, 10 Nov 2022 03:17:07 -0800 (PST) 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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229952AbiKJKYk (ORCPT + 92 others); Thu, 10 Nov 2022 05:24:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229517AbiKJKYj (ORCPT ); Thu, 10 Nov 2022 05:24:39 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 086E165CD; Thu, 10 Nov 2022 02:24:35 -0800 (PST) Received: from dggpemm500021.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N7Hsv63zFzpSsn; Thu, 10 Nov 2022 18:20:51 +0800 (CST) Received: from dggpemm500007.china.huawei.com (7.185.36.183) by dggpemm500021.china.huawei.com (7.185.36.109) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 10 Nov 2022 18:24:33 +0800 Received: from huawei.com (10.175.103.91) by dggpemm500007.china.huawei.com (7.185.36.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 10 Nov 2022 18:24:32 +0800 From: Yang Yingliang To: , , CC: , , , , , , , Subject: [PATCH v2] drivers: base: transport_class: fix possible memory leak Date: Thu, 10 Nov 2022 18:23:07 +0800 Message-ID: <20221110102307.3492557-1-yangyingliang@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500007.china.huawei.com (7.185.36.183) 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 Current some drivers(like iscsi) call transport_register_device() failed, they don't call transport_destroy_device() to release the memory allocated in transport_setup_device(), because they don't know what was done, it should be internal thing to release the resource in register function. So fix this leak by calling destroy function inside register function. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Yang Yingliang --- v1 -> v2: fix code style. --- include/linux/transport_class.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/linux/transport_class.h b/include/linux/transport_class.h index 63076fb835e3..2efc271a96fa 100644 --- a/include/linux/transport_class.h +++ b/include/linux/transport_class.h @@ -70,8 +70,14 @@ void transport_destroy_device(struct device *); static inline int transport_register_device(struct device *dev) { + int ret; + transport_setup_device(dev); - return transport_add_device(dev); + ret = transport_add_device(dev); + if (ret) + transport_destroy_device(dev); + + return ret; } static inline void -- 2.25.1