From patchwork Wed Sep 15 00:53:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 12495207 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D21B7C433EF for ; Wed, 15 Sep 2021 00:53:18 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 67C9B61242 for ; Wed, 15 Sep 2021 00:53:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 67C9B61242 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 06B9F6B0072; Tue, 14 Sep 2021 20:53:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 01ADD940008; Tue, 14 Sep 2021 20:53:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E7A98940007; Tue, 14 Sep 2021 20:53:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0103.hostedemail.com [216.40.44.103]) by kanga.kvack.org (Postfix) with ESMTP id DAFA46B0072 for ; Tue, 14 Sep 2021 20:53:17 -0400 (EDT) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 79AE73A7C2 for ; Wed, 15 Sep 2021 00:53:17 +0000 (UTC) X-FDA: 78587984034.03.C99E626 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf16.hostedemail.com (Postfix) with ESMTP id 3F380F000090 for ; Wed, 15 Sep 2021 00:53:17 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 5B0E261184; Wed, 15 Sep 2021 00:53:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631667196; bh=tjYE+w+hVKFuNE7M94ifyu2S6XUIpnaX8UMLFXe0coU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lw+x3M5cCMkeL7uU6t+ypFcqKpSGYAIHsSK5xSYO5AqJ9q1cv7It52GQzfMf9s3VR HQI0zPcUBg0ByxPU+fYataZ4ThsM2ycGnHjwKFhjMKh0lAUpNzxjUcT2si9zcTa9Rz Yo0/l5bhL37/PwA7KAIru4GI0ekzWeO3nYlbGbc435fj8AxickBdntfam1uvGIuNUf UaeX4ArMI+ImR0fa6OCVpj2TRAMDkGMj8csPWyYZcTCbLg/3Sq7yFFHvhOQowGIA9R NS98VYG+7Wl39xGCdlXM0fUyTxMXrTLFvFTeFNFOp6vBvezNUxqDeSvAdpdhyQLEZE liBpiEGhMzaEA== From: Masami Hiramatsu To: Steven Rostedt Cc: Linus Torvalds , Mike Rapoport , Andrew Morton , LKML , Ingo Molnar , Masami Hiramatsu , Linux-MM , Vlastimil Babka Subject: [PATCH v2 2/5] bootconfig: init: Fix memblock leak in xbc_make_cmdline() Date: Wed, 15 Sep 2021 09:53:14 +0900 Message-Id: <163166719378.510331.1159980452908668023.stgit@devnote2> X-Mailer: git-send-email 2.25.1 In-Reply-To: <163166717752.510331.12843735095061762373.stgit@devnote2> References: <163166717752.510331.12843735095061762373.stgit@devnote2> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 3F380F000090 Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=lw+x3M5c; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf16.hostedemail.com: domain of mhiramat@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=mhiramat@kernel.org X-Stat-Signature: uxywonegasprwuhe1wudcwyrpcsudx9r X-HE-Tag: 1631667197-429185 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Free unused memblock in a error case to fix memblock leak in xbc_make_cmdline(). Fixes: 51887d03aca1 ("bootconfig: init: Allow admin to use bootconfig for kernel command line") Signed-off-by: Masami Hiramatsu --- init/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/init/main.c b/init/main.c index 3f7216934441..0b054fff8e92 100644 --- a/init/main.c +++ b/init/main.c @@ -382,6 +382,7 @@ static char * __init xbc_make_cmdline(const char *key) 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_ptr(new_cmdline, len + 1); return NULL; }