From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 184D7C433EF for ; Fri, 19 Nov 2021 17:39:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0205260D42 for ; Fri, 19 Nov 2021 17:39:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237187AbhKSRmm (ORCPT ); Fri, 19 Nov 2021 12:42:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:44796 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237060AbhKSRmZ (ORCPT ); Fri, 19 Nov 2021 12:42:25 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id BF86061B27; Fri, 19 Nov 2021 17:39:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1637343563; bh=5LLqvr2zZCiK0qu3ot6f5Cx43IWR1bf8IXSi3IoQ7pU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C2R2HkU/w/c34nkWwbzypgwSlEy7SKA+lx4kiO+TQ+RyfGPIEl3k7nru1p9uUA7v0 IbqwOGi9h6wiJV+yyxGKp42gih//ScRe0pgA0EcWT7+Tt396+lIa/ugFtmSrGDuCoi xJwdKGsr0MbabgwjNZL4J5qOIVmhrrMkbe5DxOqE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Masami Hiramatsu , "Steven Rostedt (VMware)" Subject: [PATCH 5.14 07/15] bootconfig: init: Fix memblock leak in xbc_make_cmdline() Date: Fri, 19 Nov 2021 18:38:40 +0100 Message-Id: <20211119171443.956005694@linuxfoundation.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211119171443.724340448@linuxfoundation.org> References: <20211119171443.724340448@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Masami Hiramatsu commit 1ae43851b18afe861120ebd7c426dc44f06bb2bd upstream. Free unused memblock in a error case to fix memblock leak in xbc_make_cmdline(). Link: https://lkml.kernel.org/r/163177339181.682366.8713781325929549256.stgit@devnote2 Fixes: 51887d03aca1 ("bootconfig: init: Allow admin to use bootconfig for kernel command line") Signed-off-by: Masami Hiramatsu Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Greg Kroah-Hartman --- init/main.c | 1 + 1 file changed, 1 insertion(+) --- a/init/main.c +++ b/init/main.c @@ -382,6 +382,7 @@ static char * __init xbc_make_cmdline(co ret = xbc_snprint_cmdline(new_cmdline, len + 1, root); if (ret < 0 || ret > len) { pr_err("Failed to print extra kernel cmdline.\n"); + memblock_free(__pa(new_cmdline), len + 1); return NULL; }