From patchwork Mon Apr 24 08:06:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guanqin Miao X-Patchwork-Id: 13221824 X-Patchwork-Delegate: jes@trained-monkey.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4982FC7618E for ; Mon, 24 Apr 2023 08:07:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231504AbjDXIHn (ORCPT ); Mon, 24 Apr 2023 04:07:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231497AbjDXIHk (ORCPT ); Mon, 24 Apr 2023 04:07:40 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F61E170A for ; Mon, 24 Apr 2023 01:07:37 -0700 (PDT) Received: from kwepemi500002.china.huawei.com (unknown [172.30.72.53]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4Q4d1Y4plYz17Tgf; Mon, 24 Apr 2023 16:03:45 +0800 (CST) Received: from huawei.com (10.175.101.6) by kwepemi500002.china.huawei.com (7.221.188.171) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 24 Apr 2023 16:07:34 +0800 From: Guanqin Miao To: , , , CC: , , Subject: [PATCH 1/4] Fix memory leak in file Assemble Date: Mon, 24 Apr 2023 16:06:34 +0800 Message-ID: <20230424080637.2152893-2-miaoguanqin@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20230424080637.2152893-1-miaoguanqin@huawei.com> References: <20230424080637.2152893-1-miaoguanqin@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemi500002.china.huawei.com (7.221.188.171) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-raid@vger.kernel.org When we test mdadm with asan, we found some memory leaks in Assemble.c We fix these memory leaks based on code logic. Signed-off-by: Guanqin Miao Signed-off-by: Li Xiao Keng Acked-by: Mariusz Tkaczyk --- Assemble.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Assemble.c b/Assemble.c index 49804941..a49de183 100644 --- a/Assemble.c +++ b/Assemble.c @@ -341,8 +341,10 @@ static int select_devices(struct mddev_dev *devlist, st->ss->free_super(st); dev_policy_free(pol); domain_free(domains); - if (tst) + if (tst) { tst->ss->free_super(tst); + free(tst); + } return -1; } @@ -417,6 +419,7 @@ static int select_devices(struct mddev_dev *devlist, st->ss->free_super(st); dev_policy_free(pol); domain_free(domains); + free(st); return -1; } if (c->verbose > 0) @@ -425,6 +428,7 @@ static int select_devices(struct mddev_dev *devlist, /* make sure we finished the loop */ tmpdev = NULL; + free(st); goto loop; } else { content = *contentp; @@ -533,6 +537,7 @@ static int select_devices(struct mddev_dev *devlist, st->ss->free_super(st); dev_policy_free(pol); domain_free(domains); + free(tst); return -1; } tmpdev->used = 1; @@ -546,8 +551,10 @@ static int select_devices(struct mddev_dev *devlist, } dev_policy_free(pol); pol = NULL; - if (tst) + if (tst) { tst->ss->free_super(tst); + free(tst); + } } /* Check if we found some imsm spares but no members */ @@ -839,6 +846,7 @@ static int load_devices(struct devs *devices, char *devmap, close(mdfd); free(devices); free(devmap); + free(best); *stp = st; return -1; } @@ -1950,6 +1958,7 @@ out: } else if (mdfd >= 0) close(mdfd); + free(best); /* '2' means 'OK, but not started yet' */ if (rv == -1) { free(devices); From patchwork Mon Apr 24 08:06:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guanqin Miao X-Patchwork-Id: 13221825 X-Patchwork-Delegate: jes@trained-monkey.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51EDFC77B7C for ; Mon, 24 Apr 2023 08:07:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231511AbjDXIHo (ORCPT ); Mon, 24 Apr 2023 04:07:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231506AbjDXIHk (ORCPT ); Mon, 24 Apr 2023 04:07:40 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36736E72 for ; Mon, 24 Apr 2023 01:07:38 -0700 (PDT) Received: from kwepemi500002.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Q4d481qjdzsRGb; Mon, 24 Apr 2023 16:06:00 +0800 (CST) Received: from huawei.com (10.175.101.6) by kwepemi500002.china.huawei.com (7.221.188.171) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 24 Apr 2023 16:07:35 +0800 From: Guanqin Miao To: , , , CC: , , Subject: [PATCH 2/4] Fix memory leak in file Kill Date: Mon, 24 Apr 2023 16:06:35 +0800 Message-ID: <20230424080637.2152893-3-miaoguanqin@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20230424080637.2152893-1-miaoguanqin@huawei.com> References: <20230424080637.2152893-1-miaoguanqin@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemi500002.china.huawei.com (7.221.188.171) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-raid@vger.kernel.org When we test mdadm with asan, we found some memory leaks in Kill.c We fix these memory leaks based on code logic. Signed-off-by: Guanqin Miao Signed-off-by: Li Xiao Keng Acked-by: Mariusz Tkaczyk --- Kill.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Kill.c b/Kill.c index bfd0efdc..43c9abed 100644 --- a/Kill.c +++ b/Kill.c @@ -41,6 +41,7 @@ int Kill(char *dev, struct supertype *st, int force, int verbose, int noexcl) * 4 - failed to find a superblock. */ + bool free_super = false; int fd, rv = 0; if (force) @@ -52,8 +53,10 @@ int Kill(char *dev, struct supertype *st, int force, int verbose, int noexcl) dev); return 2; } - if (st == NULL) + if (st == NULL) { st = guess_super(fd); + free_super = true; + } if (st == NULL || st->ss->init_super == NULL) { if (verbose >= 0) pr_err("Unrecognised md component device - %s\n", dev); @@ -77,6 +80,10 @@ int Kill(char *dev, struct supertype *st, int force, int verbose, int noexcl) rv = 0; } } + if (free_super && st) { + st->ss->free_super(st); + free(st); + } close(fd); return rv; } From patchwork Mon Apr 24 08:06:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guanqin Miao X-Patchwork-Id: 13221827 X-Patchwork-Delegate: jes@trained-monkey.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3AC2CC77B76 for ; Mon, 24 Apr 2023 08:07:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231514AbjDXIHq (ORCPT ); Mon, 24 Apr 2023 04:07:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230453AbjDXIHk (ORCPT ); Mon, 24 Apr 2023 04:07:40 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E44A171A for ; Mon, 24 Apr 2023 01:07:38 -0700 (PDT) Received: from kwepemi500002.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Q4d163yYZzSv5J; Mon, 24 Apr 2023 16:03:22 +0800 (CST) Received: from huawei.com (10.175.101.6) by kwepemi500002.china.huawei.com (7.221.188.171) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 24 Apr 2023 16:07:35 +0800 From: Guanqin Miao To: , , , CC: , , Subject: [PATCH 3/4] Fix memory leak in file Manage Date: Mon, 24 Apr 2023 16:06:36 +0800 Message-ID: <20230424080637.2152893-4-miaoguanqin@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20230424080637.2152893-1-miaoguanqin@huawei.com> References: <20230424080637.2152893-1-miaoguanqin@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemi500002.china.huawei.com (7.221.188.171) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-raid@vger.kernel.org When we test mdadm with asan, we found some memory leaks in Manage.c We fix these memory leaks based on code logic. Signed-off-by: Guanqin Miao Signed-off-by: Li Xiao Keng Acked-by: Mariusz Tkaczyk --- Manage.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Manage.c b/Manage.c index f54de7c6..7b6b2798 100644 --- a/Manage.c +++ b/Manage.c @@ -222,6 +222,7 @@ int Manage_stop(char *devname, int fd, int verbose, int will_retry) if (verbose >= 0) pr_err("Cannot get exclusive access to %s:Perhaps a running process, mounted filesystem or active volume group?\n", devname); + sysfs_free(mdi); return 1; } /* If this is an mdmon managed array, just write 'inactive' @@ -801,8 +802,14 @@ int Manage_add(int fd, int tfd, struct mddev_dev *dv, rdev, update, devname, verbose, array); dev_st->ss->free_super(dev_st); - if (rv) + if (rv) { + free(dev_st); return rv; + } + } + if (dev_st) { + dev_st->ss->free_super(dev_st); + free(dev_st); } } if (dv->disposition == 'M') { @@ -1699,6 +1706,7 @@ int Manage_subdevs(char *devname, int fd, break; } } + free(tst); if (frozen > 0) sysfs_set_str(&info, NULL, "sync_action","idle"); if (test && count == 0) @@ -1706,6 +1714,7 @@ int Manage_subdevs(char *devname, int fd, return 0; abort: + free(tst); if (frozen > 0) sysfs_set_str(&info, NULL, "sync_action","idle"); return !test && busy ? 2 : 1; From patchwork Mon Apr 24 08:06:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guanqin Miao X-Patchwork-Id: 13221826 X-Patchwork-Delegate: jes@trained-monkey.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 479F7C77B61 for ; Mon, 24 Apr 2023 08:07:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231506AbjDXIHp (ORCPT ); Mon, 24 Apr 2023 04:07:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231499AbjDXIHk (ORCPT ); Mon, 24 Apr 2023 04:07:40 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0EF0C1727 for ; Mon, 24 Apr 2023 01:07:39 -0700 (PDT) Received: from kwepemi500002.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Q4d493xdwzsS62; Mon, 24 Apr 2023 16:06:01 +0800 (CST) Received: from huawei.com (10.175.101.6) by kwepemi500002.china.huawei.com (7.221.188.171) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 24 Apr 2023 16:07:36 +0800 From: Guanqin Miao To: , , , CC: , , Subject: [PATCH 4/4] Fix memory leak in file mdadm Date: Mon, 24 Apr 2023 16:06:37 +0800 Message-ID: <20230424080637.2152893-5-miaoguanqin@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20230424080637.2152893-1-miaoguanqin@huawei.com> References: <20230424080637.2152893-1-miaoguanqin@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemi500002.china.huawei.com (7.221.188.171) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-raid@vger.kernel.org When we test mdadm with asan, we found some memory leaks in mdadm.c We fix these memory leaks based on code logic. Signed-off-by: Guanqin Miao Signed-off-by: Li Xiao Keng Acked-by: Mariusz Tkaczyk --- mdadm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mdadm.c b/mdadm.c index 2296911d..409da62c 100644 --- a/mdadm.c +++ b/mdadm.c @@ -1709,6 +1709,10 @@ int main(int argc, char *argv[]) autodetect(); break; } + if (ss) { + ss->ss->free_super(ss); + free(ss); + } if (locked) cluster_release_dlmlock(); close_fd(&mdfd);