From patchwork Tue Jul 12 01:00:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianglei Nie X-Patchwork-Id: 12914408 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 2C3FBC433EF for ; Tue, 12 Jul 2022 01:01:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232148AbiGLBBi (ORCPT ); Mon, 11 Jul 2022 21:01:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232154AbiGLBBd (ORCPT ); Mon, 11 Jul 2022 21:01:33 -0400 Received: from mail-m971.mail.163.com (mail-m971.mail.163.com [123.126.97.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E731E2E68B; Mon, 11 Jul 2022 18:01:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=3punI vIPkKlM/8SU3deWci59gXZoY5NLzvTD+3wQ/HI=; b=jQ6ztP6l8lXtFdHuNcI8e my363dV1FP2DSjoPRiQ/KULXg4CxC6BdQ9HJnVmEQcVva6FHvpXaAlgJJMjZnmff 7wElftY53IZCdzRjwykHkuVas7T7nNAop4esWQ9bIeeB3b88yMnDcTtmGixIy1rL bR8rR7s0+svSjQPfAY1i7U= Received: from localhost.localdomain (unknown [123.112.69.106]) by smtp1 (Coremail) with SMTP id GdxpCgCXzonJx8xiSfUyNw--.11337S4; Tue, 12 Jul 2022 09:01:14 +0800 (CST) From: Jianglei Nie To: bhe@redhat.com, vgoyal@redhat.com, dyoung@redhat.com Cc: kexec@lists.infradead.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Jianglei Nie Subject: [PATCH v4] proc/vmcore: fix potential memory leak in vmcore_init() Date: Tue, 12 Jul 2022 09:00:55 +0800 Message-Id: <20220712010055.2328111-1-niejianglei2021@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: GdxpCgCXzonJx8xiSfUyNw--.11337S4 X-Coremail-Antispam: 1Uf129KBjvdXoWrKrWUtFyDCr1xAr1rCryUJrb_yoWkKrc_Cw 4UKr4xX3yrGa13Gr4UK3W5tw42kw1Y9rn8Xr1xCF9rJayrKwsxWrZ7urZ3Ar93JrsY9345 uw4SkrW7u345KjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7xRibAwPUUUUU== X-Originating-IP: [123.112.69.106] X-CM-SenderInfo: xqlhyxxdqjzvrlsqjii6rwjhhfrp/1tbiFRo8jF5mLvq-eQAAsV Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org elfcorehdr_alloc() allocates a memory chunk for elfcorehdr_addr with kzalloc(). If is_vmcore_usable() returns false, elfcorehdr_addr is a predefined value. If parse_crash_elf_headers() occurs some error and returns a negetive value, the elfcorehdr_addr should be released with elfcorehdr_free(). We can fix by calling elfcorehdr_free() when parse_crash_elf_headers() fails. Signed-off-by: Jianglei Nie Acked-by: Baoquan He --- fs/proc/vmcore.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c index 4eaeb645e759..390515c249dd 100644 --- a/fs/proc/vmcore.c +++ b/fs/proc/vmcore.c @@ -1569,15 +1569,16 @@ static int __init vmcore_init(void) rc = parse_crash_elf_headers(); if (rc) { pr_warn("Kdump: vmcore not initialized\n"); - return rc; + goto fail; } - elfcorehdr_free(elfcorehdr_addr); elfcorehdr_addr = ELFCORE_ADDR_ERR; proc_vmcore = proc_create("vmcore", S_IRUSR, NULL, &vmcore_proc_ops); if (proc_vmcore) proc_vmcore->size = vmcore_size; - return 0; +fail: + elfcorehdr_free(elfcorehdr_addr); + return rc; } fs_initcall(vmcore_init);