From patchwork Thu Sep 28 01:27:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Zetao X-Patchwork-Id: 1840473 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4Rwwp53hDGz1ynm for ; Thu, 28 Sep 2023 11:27:41 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229920AbjI1B1h (ORCPT ); Wed, 27 Sep 2023 21:27:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229848AbjI1B1g (ORCPT ); Wed, 27 Sep 2023 21:27:36 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92198AC; Wed, 27 Sep 2023 18:27:35 -0700 (PDT) Received: from kwepemd200002.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4RwwlJ6WMxzrT4m; Thu, 28 Sep 2023 09:25:16 +0800 (CST) Received: from huawei.com (10.90.53.73) by kwepemd200002.china.huawei.com (7.221.188.186) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.1258.23; Thu, 28 Sep 2023 09:27:33 +0800 From: Li Zetao To: , , CC: , , , Li Zetao Subject: [PATCH RESEND] i2c: core: Fix possible memleak in i2c_register_adapter() Date: Thu, 28 Sep 2023 09:27:09 +0800 Message-ID: <20230928012709.1247208-1-lizetao1@huawei.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.90.53.73] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemd200002.china.huawei.com (7.221.188.186) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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-i2c@vger.kernel.org There is a memory leak reported by kmemleak: unreferenced object 0xffff88818be6dcb8 (size 8): comm "modprobe", pid 1022129, jiffies 4363911608 (age 43.838s) hex dump (first 8 bytes): 69 32 63 2d 30 00 6b a5 i2c-0.k. backtrace: [] __kmem_cache_alloc_node+0x2cf/0x4b0 [] __kmalloc_node_track_caller+0x53/0x140 [] kvasprintf+0x6a/0xd0 [] kvasprintf_const+0x77/0xa0 [] kobject_set_name_vargs+0x23/0x90 [] dev_set_name+0x53/0x70 [] i2c_register_adapter+0x112/0x6c0 [i2c_core] [] i2c_add_adapter+0x78/0xc0 [i2c_core] [] piix4_add_adapter+0x132/0x210 [i2c_piix4] [] piix4_probe+0x2d5/0x5f4 [i2c_piix4] ... The root cause was traced to an error handing path in i2c_register_adapter() when device_register() fails. After calling dev_set_name() which called by i2c_register_adapter(), the put_device() should be used to give up the device reference in error handling path in order to free "kobj->name" alloced in dev_set_name(). Fix it by calling put_device() when device_register() fails in i2c_register_adapter(). In addition, when i2c_adapter device is released, i2c_adapter_dev_release() is called, in which "dev_released" must be initialized, otherwise a kernel bug will be triggered. Fixes: b119c6c952a0 ("i2c: __must_check fixes (core drivers)") Signed-off-by: Li Zetao --- drivers/i2c/i2c-core-base.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index 60746652fd52..cc4a20465456 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -1514,6 +1514,9 @@ static int i2c_register_adapter(struct i2c_adapter *adap) res = device_register(&adap->dev); if (res) { pr_err("adapter '%s': can't register device (%d)\n", adap->name, res); + init_completion(&adap->dev_released); + put_device(&adap->dev); + wait_for_completion(&adap->dev_released); goto out_list; }