Message ID | 20230928012709.1247208-1-lizetao1@huawei.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3009806vqu; Wed, 27 Sep 2023 18:34:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHxPkgFRJ9JBeJmk9RILxjdR6JoFYNZvcL6mYFptqnex8MeewUuqHbzU8OXCJtH8W1EdSGx X-Received: by 2002:a17:902:650f:b0:1c3:2df4:8791 with SMTP id b15-20020a170902650f00b001c32df48791mr3551193plk.27.1695864898835; Wed, 27 Sep 2023 18:34:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695864898; cv=none; d=google.com; s=arc-20160816; b=vVVHj1ObRBFZvK0+yHAq54mcKocT9rjOawivMKrIixr2gRO4/009JAdLPEagHaVWmU PXg+hUNrScou4DKEXwMFai/+p0chbtyzIXTUgw+2q7jseEnWMJyhDefsYeslfrqmwCN5 x779TbkclJZ9qVa9nm+OFj04dBHQm+N7eT5uZnd92qEhyiSYNe6kwhfRm2K6FjBAguUD pSMw9UNOsgRf0rn1p2Cdf+yGJJLDJn56V/jVXN6TKCsG14l69PrrjivU7k1AW1u497Z8 IP1NQa3g9UD1FwzGs9gQ6cq1iX+sE4ppmWBkfBv8Du5Rx2cL+Mr7iha0v37Toyv54CV3 0gvw== 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=42FGa6hjEcV/yFh4qm8QAvhiQ1sL+xk9n1OExY96374=; fh=BGjwTHI7wCW5vtic/2N8KohyAMCKFzlh39zeJidwm4w=; b=kRroSeeYjRoBQfpmn/1BCsqW+yq33lf5p0Q6109Q4L+cnO4lKdwPtJ88rB0QUS0q75 IXQn6TBkDEzMsUZMJtIM0QQIrcrymufSobNDlTtlG1bVZhy50jhpQ7jTBAzCV9yauVlB jL05R+rKpVQskT7BNBm0xAn66hFj7KnDFaXyPMLV0imC2QwRYGtRDatPUZGtGQni4YnA SNSOEHRWvUYlkyQcymuyjL9pr/ymTipVRF9AyOWvD8Ugkex54Lvu0WqnSy7Rj44X+mCC 8swUIDffPpiQttvaD9r+DBfJZ/4KQmVToQ8CVqvb2/qTToKyN8hsOGMnsrc9RbKZXru5 MI0A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id h4-20020a170902f54400b001c72476c96fsi4123845plf.143.2023.09.27.18.34.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 18:34:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 3353080B8DF4; Wed, 27 Sep 2023 18:27:44 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229437AbjI1B1j (ORCPT <rfc822;ruipengqi7@gmail.com> + 20 others); Wed, 27 Sep 2023 21:27:39 -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 <rfc822;linux-kernel@vger.kernel.org>); 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 <lizetao1@huawei.com> To: <wsa@kernel.org>, <khali@linux-fr.org>, <gregkh@suse.de> CC: <lizeta1@huawei.com>, <linux-i2c@vger.kernel.org>, <linux-kernel@vger.kernel.org>, Li Zetao <lizetao1@huawei.com> 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 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 27 Sep 2023 18:27:44 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778243231908417395 X-GMAIL-MSGID: 1778243231908417395 |
Series |
[RESEND] i2c: core: Fix possible memleak in i2c_register_adapter()
|
|
Commit Message
Li Zetao
Sept. 28, 2023, 1:27 a.m. UTC
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:
[<ffffffff812f588f>] __kmem_cache_alloc_node+0x2cf/0x4b0
[<ffffffff81283c43>] __kmalloc_node_track_caller+0x53/0x140
[<ffffffff81604b0a>] kvasprintf+0x6a/0xd0
[<ffffffff81604be7>] kvasprintf_const+0x77/0xa0
[<ffffffff81a00173>] kobject_set_name_vargs+0x23/0x90
[<ffffffff817bf743>] dev_set_name+0x53/0x70
[<ffffffffa023ebb2>] i2c_register_adapter+0x112/0x6c0 [i2c_core]
[<ffffffffa023f268>] i2c_add_adapter+0x78/0xc0 [i2c_core]
[<ffffffffa0300182>] piix4_add_adapter+0x132/0x210 [i2c_piix4]
[<ffffffffa0300535>] 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 <lizetao1@huawei.com>
---
drivers/i2c/i2c-core-base.c | 3 +++
1 file changed, 3 insertions(+)
Comments
On Thu, Sep 28, 2023 at 09:27:09AM +0800, Li Zetao wrote: > 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: > [<ffffffff812f588f>] __kmem_cache_alloc_node+0x2cf/0x4b0 > [<ffffffff81283c43>] __kmalloc_node_track_caller+0x53/0x140 > [<ffffffff81604b0a>] kvasprintf+0x6a/0xd0 > [<ffffffff81604be7>] kvasprintf_const+0x77/0xa0 > [<ffffffff81a00173>] kobject_set_name_vargs+0x23/0x90 > [<ffffffff817bf743>] dev_set_name+0x53/0x70 > [<ffffffffa023ebb2>] i2c_register_adapter+0x112/0x6c0 [i2c_core] > [<ffffffffa023f268>] i2c_add_adapter+0x78/0xc0 [i2c_core] > [<ffffffffa0300182>] piix4_add_adapter+0x132/0x210 [i2c_piix4] > [<ffffffffa0300535>] 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 <lizetao1@huawei.com> Applied to for-next, thanks!
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; }