From patchwork Thu Nov 10 03:37:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yingliang X-Patchwork-Id: 17940 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp710116wru; Wed, 9 Nov 2022 19:54:52 -0800 (PST) X-Google-Smtp-Source: AMsMyM7WcJXsh3fduUkOtRh90Gp95BP0STqYPMAPw5g/lM8qnJqe8dYJjI9u2R9UtmQzHOntJiwz X-Received: by 2002:a05:6402:754:b0:463:67da:3dc with SMTP id p20-20020a056402075400b0046367da03dcmr52628110edy.386.1668052492364; Wed, 09 Nov 2022 19:54:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668052492; cv=none; d=google.com; s=arc-20160816; b=RXvue+jz2QVL27bKLc1wFkHRNLDNvz4xP0XXX8tc01RxiaH5snDD7snr7qw+oDWO+i uMa4xy/HecmSJQ/5ZNGeqYDJEMpwfN3+Hi4lvHcia2LQcBbwuypZNFx7apTq9uvn5NRS DBuhUy4Trzk2pMEw2UqaBVvlaKd45AUOAmvYEeQjUqX/RNul21HP/lzWrXd0bMt7YXQo HPheB3AvzHYZLK5g5UqU4X8bxYlWTkP/TAgf6VJh5AMnhRbZrn9xybpiUynYDEq8WE7Z cMGsvLZOOKki/yMx8/dpUCHyLxeBMG8P5DCqvOBnNIzEH5iY0g3tTMVkM8U48ZTJHJ9j ly8A== 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=Ouq/peqeguXQH5QBjB2s1a/c6wXyicNDnfrLJ7brQ9s=; b=lUZ9ZfLAGk2/8eZ7KeYOF5ZGzBcaNuCawx+zrHKTheNWJ1u4AT9pcVIuAxelHOLjK4 P2rXVPud2N0+wrc5ocT/P/RxZIElj1A9HXG8W0YGF2hKKyv4lBMMmYUohWykQ+RM+Y2a +tuforr4kNL4a6Lq0851HfmDI9nEsleobEOUuqIhQR0ewfHhG3zIvJRhk9zXz2Cjba+u P+sTzay/4JvOI83Z/e0836EN232M3xOuCLU6LPYS8MAXzfu9pjtn88M8WZ2itr21fVQf wZZM92lk4PjaGQ5D0HkedLuYhHK1jwLJe0RXr+EyzFr9YMAiRDsx34ajJenVQ65mrJmO PH+w== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h11-20020a170906854b00b0078decbc3fe4si12857548ejy.274.2022.11.09.19.54.28; Wed, 09 Nov 2022 19:54:52 -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 S232695AbiKJDir (ORCPT + 99 others); Wed, 9 Nov 2022 22:38:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232469AbiKJDip (ORCPT ); Wed, 9 Nov 2022 22:38:45 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE576124; Wed, 9 Nov 2022 19:38:44 -0800 (PST) Received: from dggpemm500020.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N76xh63KYzRp0f; Thu, 10 Nov 2022 11:38:32 +0800 (CST) Received: from dggpemm500007.china.huawei.com (7.185.36.183) by dggpemm500020.china.huawei.com (7.185.36.49) 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 11:38:43 +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 11:38:42 +0800 From: Yang Yingliang To: , CC: , , , Subject: [PATCH] drivers: base: transport_class: fix resource leak when transport_add_device() fails Date: Thu, 10 Nov 2022 11:37:21 +0800 Message-ID: <20221110033721.11974-1-yangyingliang@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749079810239648104?= X-GMAIL-MSGID: =?utf-8?q?1749079810239648104?= The normal call sequence of using transport class is: Add path: transport_setup_device() transport_setup_classdev() // call sas_host_setup() here transport_add_device() // if fails, need call transport_destroy_device() transport_configure_device() Remove path: transport_remove_device() transport_remove_classdev // call sas_host_remove() here transport_destroy_device() If transport_add_device() fails, need call transport_destroy_device() to free memory, but in this case, ->remove() is not called, and the resources allocated in ->setup() are leaked. So fix these leaks by calling ->remove() in transport_add_class_device() if it returns error. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Yang Yingliang --- drivers/base/transport_class.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/base/transport_class.c b/drivers/base/transport_class.c index ccc86206e508..d0237db6236f 100644 --- a/drivers/base/transport_class.c +++ b/drivers/base/transport_class.c @@ -155,6 +155,7 @@ static int transport_add_class_device(struct attribute_container *cont, struct device *dev, struct device *classdev) { + struct transport_class *tclass = class_to_transport_class(cont->class); int error = attribute_container_add_class_device(classdev); struct transport_container *tcont = attribute_container_to_transport_container(cont); @@ -162,6 +163,9 @@ static int transport_add_class_device(struct attribute_container *cont, if (!error && tcont->statistics) error = sysfs_create_group(&classdev->kobj, tcont->statistics); + if (error && tclass->remove) + tclass->remove(tcont, dev, classdev); + return error; }