Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp5769053rwi; Tue, 18 Oct 2022 04:02:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM79rQcw8OVghSmSvZwX7T3q4t4y8pJ9wIAxLyf7KtX7nrAAWP9xdBEfb7RTiF4rcLbw+Wuq X-Received: by 2002:a17:902:8b83:b0:17f:5de5:c5ff with SMTP id ay3-20020a1709028b8300b0017f5de5c5ffmr2499866plb.52.1666090977646; Tue, 18 Oct 2022 04:02:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666090977; cv=none; d=google.com; s=arc-20160816; b=FXL6JRNWA/q/Gy8smNL8XLYUglBk4lTJIsSulHICBoS7w+pyYtaUpBuwO+PQXN1U8I tgNV3G0l+rIX9ps0kRJ/6HMMNNsUdkCLVUOhoRD501T/dBFu/GSGs2/0C2xD/0yw3Dp3 dtwAjCJSsogQ1hIk95MBp15cTuuiVXnjB80oXevFWcWjDbOFwksj6d9J0IewCXaqi4nw czw4mQidRDqzF3YPCziOjJuzxF1MLMNSYXLxNazIUTQclLADQ6dKB6CNQPO9Xy3Tetff bIifQTkZu+/sKmdYzSC+la70xyZ+Fnz0D21B7pirJ4B+Blr1v4j64a29Ay9Yje4zSMgm Uicw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-language:content-transfer-encoding :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject; bh=jHKE4d/tXdqNPqx55BBDyVhz3NT1zSuolu6R+vKdTE8=; b=quCxgSF061ETapa4H3us0MIQ7JgnnPH1hXtGMbxoZ5S5jxSR41ueWhR9J+ue09Ektu swVu78/0abuw+S5tVF7BsNo5pTGcqlBEDuDS2rSJnd6ViVOfgx5OwydaYLX0pH/evPU5 OrRQNF0kWLDOWTpxvD2XEF9sxTENTeDjrolNKrmJClB8RX3VAC6wybz7yCX5ylGKkQu4 P67XMhi5cLR00u+JLzgs5vD0zpbYBPVS9X03PQvFQTCrwuhAiApU3jRMEoL/Ixklg/BY VE54uLbqwt6IynQhF+sn3OU1HICgKuvoDrbzBZIy7l1M/vr7Hbf7DVqcXdGwv0jj9rBG E34g== 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 l23-20020a637017000000b004607f6b2586si15343714pgc.736.2022.10.18.04.02.41; Tue, 18 Oct 2022 04:02:57 -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 S229864AbiJRKdo (ORCPT + 99 others); Tue, 18 Oct 2022 06:33:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229981AbiJRKdd (ORCPT ); Tue, 18 Oct 2022 06:33:33 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9FAFEB40CD for ; Tue, 18 Oct 2022 03:33:31 -0700 (PDT) Received: from dggpemm500023.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Ms97p3ztxzVhsb; Tue, 18 Oct 2022 18:28:54 +0800 (CST) Received: from dggpemm500007.china.huawei.com (7.185.36.183) by dggpemm500023.china.huawei.com (7.185.36.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 18 Oct 2022 18:33:30 +0800 Received: from [10.174.178.174] (10.174.178.174) 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; Tue, 18 Oct 2022 18:33:29 +0800 Subject: Re: [PATCH] ocfs2: possible memory leak in mlog_sys_init() To: Joseph Qi , , CC: , , , References: <20221018075213.736562-1-yangyingliang@huawei.com> From: Yang Yingliang Message-ID: <09bb2844-e20a-98e8-c2af-5b6c4795d48e@huawei.com> Date: Tue, 18 Oct 2022 18:33:29 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-Originating-IP: [10.174.178.174] 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,NICE_REPLY_A, 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 Hi, On 2022/10/18 17:02, Joseph Qi wrote: > Hi, > > On 10/18/22 3:52 PM, Yang Yingliang wrote: >> Inject fault while probing module, kset_register() may fail, >> if it fails, but the refcount of kobject is not decreased to >> 0, the name allocated in kobject_set_name() is leaked. Fix >> this by calling kset_put(), so that name can be freed in >> callback function kobject_cleanup(). >> >> unreferenced object 0xffff888100da9348 (size 8): >> comm "modprobe", pid 257, jiffies 4294701096 (age 33.334s) >> hex dump (first 8 bytes): >> 6c 6f 67 6d 61 73 6b 00 logmask. >> backtrace: >> [<00000000306e441c>] __kmalloc_node_track_caller+0x44/0x1b0 >> [<000000007c491a9e>] kstrdup+0x3a/0x70 >> [<0000000015719a3b>] kstrdup_const+0x63/0x80 >> [<0000000084e458ea>] kvasprintf_const+0x149/0x180 >> [<0000000091302b42>] kobject_set_name_vargs+0x56/0x150 >> [<000000005f48eeac>] kobject_set_name+0xab/0xe0 >> >> Fixes: 34980ca8faeb ("Drivers: clean up direct setting of the name of a kset") >> Signed-off-by: Yang Yingliang >> --- >> fs/ocfs2/cluster/masklog.c | 7 ++++++- >> 1 file changed, 6 insertions(+), 1 deletion(-) >> >> diff --git a/fs/ocfs2/cluster/masklog.c b/fs/ocfs2/cluster/masklog.c >> index 563881ddbf00..7f9ba816d955 100644 >> --- a/fs/ocfs2/cluster/masklog.c >> +++ b/fs/ocfs2/cluster/masklog.c >> @@ -156,6 +156,7 @@ static struct kset mlog_kset = { >> int mlog_sys_init(struct kset *o2cb_kset) >> { >> int i = 0; >> + int ret; >> >> while (mlog_attrs[i].attr.mode) { >> mlog_default_attrs[i] = &mlog_attrs[i].attr; >> @@ -165,7 +166,11 @@ int mlog_sys_init(struct kset *o2cb_kset) >> >> kobject_set_name(&mlog_kset.kobj, "logmask"); >> mlog_kset.kobj.kset = o2cb_kset; >> - return kset_register(&mlog_kset); >> + ret = kset_register(&mlog_kset); > If register fails, it will call unregister in o2cb_sys_init(), which > will put kobject. They are different ksets, the kset unregistered in o2cb_sys_init() is 'o2cb_kset', the kset used to registered in mlog_sys_init() is 'mlog_kset', and they hold difference refcounts. Thanks, Yang > > Thanks, > Joseph > >> + if (ret) >> + kset_put(&mlog_kset); >> + >> + return ret; >> } >> >> void mlog_sys_shutdown(void) > .