From patchwork Mon Oct 17 12:18:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yingliang X-Patchwork-Id: 3428 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1426466wrs; Mon, 17 Oct 2022 05:46:26 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7LtzwdcJd5rMiMm7dWqHTnpxAd4kHjcGoYqDZKrMl+hTLGIBC/0yqGo39lRMEm6WYtaVAH X-Received: by 2002:aa7:c509:0:b0:458:cb1f:b9e1 with SMTP id o9-20020aa7c509000000b00458cb1fb9e1mr10006812edq.369.1666010786369; Mon, 17 Oct 2022 05:46:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666010786; cv=none; d=google.com; s=arc-20160816; b=AxjX5Pf3z5zqx8WOd2ZhGxzi/G0I0RUirs+Qhtoy0ou6L9ltumniPzoBaVFlKM/0h6 ePy1y4H2MBykj3cX3st4YojqsRajQPzumO1Vc2KVvnRX1GAISebZ2RaMz1hP/DU7TW3A juCxeXngm+I//KV49dklKnYsM1qEuyngSYgnDiqIBlgh7sERnscARYq5EQ2eS2+yDwst x89sqRstZ01ROqti8GbYBfzhRG8s+MOH0Gnd3XVCSh62wOP3jrXzKODb9nb93qvNosCZ CR1dggjKOGbPI9LhIWh2YjEjU1G0ovsL2ys1xFi+Fcd8URv4MSNeyQIouYOmOrkLXyfv gUzw== 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=K38wwoxOo3pa6WHL2pwKSOfT5+7hNU3hXMSfYpRlgUE=; b=u8CGPdRQCwP4iFnNDnFtfjrKZwUeY1/v/p9dKRyRTpY+itJwKP7kcK3daI6QZqqK0R j/67p8wO9ZzrKpP3mPA4QabOkdAVdmR/K2XOz+B0hDWPNiPoPUcMDp0jG84NlSfHAn4r vcnqlG8Gc2crUFVGZy0agBULQ3BbWi+JkgqcekKZKY3S7mKk1373Q4CplkTc/EWVzDPU K+kjCCoE2ZUbCtYyScIlKBIJ29fXH4iI5TDqfO8eCvOMWk2HcHliO9egST2/Dec1Ayk3 JyVN6zewNwr5V4vhfiFt/SxhhgsdlmMgiwFVWQ9D/zrj8oaZ2tbpXhMqQwxTD2PX+Qph 9ksQ== 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 n16-20020a5099d0000000b0045c0accb2b8si9633032edb.205.2022.10.17.05.45.59; Mon, 17 Oct 2022 05:46:26 -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; 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 S230212AbiJQMkP (ORCPT + 99 others); Mon, 17 Oct 2022 08:40:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229562AbiJQMkM (ORCPT ); Mon, 17 Oct 2022 08:40:12 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9570437FB5 for ; Mon, 17 Oct 2022 05:40:09 -0700 (PDT) Received: from dggpemm500021.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Mrbdr2j5zzHv2K; Mon, 17 Oct 2022 20:19:28 +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; Mon, 17 Oct 2022 20:19:29 +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; Mon, 17 Oct 2022 20:19:29 +0800 From: Yang Yingliang To: CC: , Subject: [PATCH v2] class: fix possible memory leak in __class_register() Date: Mon, 17 Oct 2022 20:18:55 +0800 Message-ID: <20221017121855.67335-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?1746903100090959115?= X-GMAIL-MSGID: =?utf-8?q?1746938926504863077?= Inject fault while probing module (e.g. pktcdvd.ko), kset_register() may fail in __class_register(), if it fails, but the refcount of kobject is not decreased to 0, the name allocated in kobject_set_name() is leaked. To fix this by calling kfree_const(). unreferenced object 0xffff888102fa8190 (size 8): comm "modprobe", pid 502, jiffies 4294906074 (age 49.296s) hex dump (first 8 bytes): 70 6b 74 63 64 76 64 00 pktcdvd. backtrace: [<00000000e7c7703d>] __kmalloc_track_caller+0x1ae/0x320 [<000000005e4d70bc>] kstrdup+0x3a/0x70 [<00000000c2e5e85a>] kstrdup_const+0x68/0x80 [<000000000049a8c7>] kvasprintf_const+0x10b/0x190 [<0000000029123163>] kobject_set_name_vargs+0x56/0x150 [<00000000747219c9>] kobject_set_name+0xab/0xe0 [<0000000005f1ea4e>] __class_register+0x15c/0x49a If class_add_groups() fails, it need delete kobject and free its name, besides, subsys_private also need be freed. unreferenced object 0xffff888037274000 (size 1024): comm "modprobe", pid 502, jiffies 4294906074 (age 49.296s) hex dump (first 32 bytes): 00 40 27 37 80 88 ff ff 00 40 27 37 80 88 ff ff .@'7.....@'7.... 00 00 00 00 ad 4e ad de ff ff ff ff 00 00 00 00 .....N.......... backtrace: [<00000000151f9600>] kmem_cache_alloc_trace+0x17c/0x2f0 [<00000000ecf3dd95>] __class_register+0x86/0x49a It can not call kset_put() or kset_unregister() in error path, because the 'cls' will be freed in callback function class_release() and it also freed in error path, it will cause double free. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Yang Yingliang --- v1 -> v2: Update commit message and add fix tag. --- drivers/base/class.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/base/class.c b/drivers/base/class.c index 64f7b9a0970f..87de0a04ee9b 100644 --- a/drivers/base/class.c +++ b/drivers/base/class.c @@ -187,11 +187,17 @@ int __class_register(struct class *cls, struct lock_class_key *key) error = kset_register(&cp->subsys); if (error) { + kfree_const(cp->subsys.kobj.name); kfree(cp); return error; } error = class_add_groups(class_get(cls), cls->class_groups); class_put(cls); + if (error) { + kobject_del(&cp->subsys.kobj); + kfree_const(cp->subsys.kobj.name); + kfree(cp); + } return error; } EXPORT_SYMBOL_GPL(__class_register);