From patchwork Sat Jun 3 14:41:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaohe Lin X-Patchwork-Id: 102765 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1505608vqr; Sat, 3 Jun 2023 00:02:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5RNiShn/oCVPUoFbqKFmL/jMP+bSr8sG3xO4AI4d3sUcxM8GO8El5xl9zqTR4R2SH9eijX X-Received: by 2002:a17:902:c404:b0:1b0:7123:6ee8 with SMTP id k4-20020a170902c40400b001b071236ee8mr2284754plk.61.1685775775757; Sat, 03 Jun 2023 00:02:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685775775; cv=none; d=google.com; s=arc-20160816; b=QNxFridBNO4iufbj6b/+Q3CqCzVqKHZREfIoibidWX+VteA/1ejQzqD3YbclgI2wBO +TwXtZ4aIMS4mUxAsBRTLJeB5dAZl0I1UTzsxdLWFUI82Gpb/mSTFNVyEqpuDOays1sJ UPZdpWHQy3fZ4flf/60kyt58cmXFEC+BgsIZ/Si1Mi1bGHlCz0jjP310OlFpTMJAXAd9 ycW6XfXJXdkNjFPquNSbeRrNLM6fyU1aizlhGVzQldl7RkZ9F8SZsg37UNznu25a2e4e rStOCgmftlCUYkS0LkvgcpVNSgQfkPwn/8pIDMy0RoWMwcjOH7AaYm1DwXXLqmyOHfMv GJMA== 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=ie7Yo9JcbDjmVJHg1bVv9F/JmUTiDoxx1fbKVAwYob4=; b=HH0VZsPXxuxyw0buJ3UPiiFJ+b4oUj4CQ05pedIpQcaizWjN3A946vqYJizZtGyXAd gg9MEXEWkyStT/w9LVZ8Lil4xdSSWAov04hI407OHO3gKebjGozLHGcShYWFgG4wEOaP u6FqFzpU6oZQkhZNo9rfK7aV6v0IWsold+7+8YpKamvbcoz0qcXYyfjzxYQNlFtNAzeF 49rDnuLWr45h/q39ttS2bAcaHOSdo/u7/Gb+KnCo/6YE74KvLy6InZxskE9zry++QaLW dI/RWssYHxRZj3R8z+Y0TmoEFtdiO10sMg8QLVYtRrDwX7UoQo6efRalm6pPCTKcQFyL Hiuw== 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 c4-20020a170902d48400b001b04a379cd2si2181088plg.348.2023.06.03.00.02.44; Sat, 03 Jun 2023 00:02:55 -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 S232027AbjFCGua (ORCPT + 99 others); Sat, 3 Jun 2023 02:50:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231444AbjFCGu3 (ORCPT ); Sat, 3 Jun 2023 02:50:29 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA550E58; Fri, 2 Jun 2023 23:50:27 -0700 (PDT) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4QY9Rq21RwztQTy; Sat, 3 Jun 2023 14:48:07 +0800 (CST) Received: from huawei.com (10.175.104.170) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Sat, 3 Jun 2023 14:50:24 +0800 From: Miaohe Lin To: , CC: , , , , , Subject: [PATCH] EDAC/mc: fix potential memoryleak in edac_mc_alloc() Date: Sat, 3 Jun 2023 22:41:31 +0800 Message-ID: <20230603144131.832804-1-linmiaohe@huawei.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-Originating-IP: [10.175.104.170] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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?1767664019399888294?= X-GMAIL-MSGID: =?utf-8?q?1767664019399888294?= When fails to allocate memory for layers or pvt_info, _edac_mc_free() will be called to release the resource of edac mc but mci->dev is not even initialized at that time. _edac_mc_free() will fail to release the allocated memory. Fixes: 0bbb265f7089 ("EDAC/mc: Get rid of silly one-shot struct allocation in edac_mc_alloc()") Signed-off-by: Miaohe Lin --- drivers/edac/edac_mc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index 6faeb2ab3960..89dc5954d19e 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c @@ -364,6 +364,8 @@ struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num, mci = kzalloc(sizeof(struct mem_ctl_info), GFP_KERNEL); if (!mci) return NULL; + mci->dev.release = mci_release; + device_initialize(&mci->dev); mci->layers = kcalloc(n_layers, sizeof(struct edac_mc_layer), GFP_KERNEL); if (!mci->layers) @@ -373,9 +375,6 @@ struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num, if (!mci->pvt_info) goto error; - mci->dev.release = mci_release; - device_initialize(&mci->dev); - /* setup index and various internal pointers */ mci->mc_idx = mc_num; mci->tot_dimms = tot_dimms;