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 X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 B835BC433B4 for ; Fri, 7 May 2021 01:04:41 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 66822613B9 for ; Fri, 7 May 2021 01:04:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 66822613B9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 0ACE66B007E; Thu, 6 May 2021 21:04:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 032606B0080; Thu, 6 May 2021 21:04:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E14EE6B0082; Thu, 6 May 2021 21:04:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0223.hostedemail.com [216.40.44.223]) by kanga.kvack.org (Postfix) with ESMTP id BA23B6B007E for ; Thu, 6 May 2021 21:04:40 -0400 (EDT) Received: from smtpin34.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 7987E9431 for ; Fri, 7 May 2021 01:04:40 +0000 (UTC) X-FDA: 78112639920.34.649E9FA Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf09.hostedemail.com (Postfix) with ESMTP id 776AF600010A for ; Fri, 7 May 2021 01:04:30 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 45C9F61289; Fri, 7 May 2021 01:04:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1620349479; bh=93ef1ukrQMbpy8g1f2XZQsltw+KWYX9RH2E4/K5tXJ0=; h=Date:From:To:Subject:In-Reply-To:From; b=R6MTX3Xg9GUclNGcr04lJGsZcUwCVwgKQ9RkCnDgN9VW+kcCrK39uHFHJECOU9z+8 JXP+twC+W/Ya/wOVTcq25UpRPS8heFjPOHqN1uKjwKzwOpDnSoX9AeOjac+c23kZ11 kTrvUobjrt/4fmOigEz5Y9N/L+2RzD4hX0iuc2+M= Date: Thu, 06 May 2021 18:04:38 -0700 From: Andrew Morton To: akpm@linux-foundation.org, baijiaju1990@gmail.com, bhe@redhat.com, linux-mm@kvack.org, mm-commits@vger.kernel.org, oslab@tsinghua.edu.cn, torvalds@linux-foundation.org Subject: [patch 50/91] kernel: kexec_file: fix error return code of kexec_calculate_store_digests() Message-ID: <20210507010438.8fLVHEks0%akpm@linux-foundation.org> In-Reply-To: <20210506180126.03e1baee7ca52bedb6cc6003@linux-foundation.org> User-Agent: s-nail v14.8.16 Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=R6MTX3Xg; spf=pass (imf09.hostedemail.com: domain of akpm@linux-foundation.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 776AF600010A X-Stat-Signature: kj34xeaezo3ifsi3gsnj4s7e3o33prs4 Received-SPF: none (linux-foundation.org>: No applicable sender policy available) receiver=imf09; identity=mailfrom; envelope-from=""; helo=mail.kernel.org; client-ip=198.145.29.99 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1620349470-637191 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: From: Jia-Ju Bai Subject: kernel: kexec_file: fix error return code of kexec_calculate_store_digests() When vzalloc() returns NULL to sha_regions, no error return code of kexec_calculate_store_digests() is assigned. To fix this bug, ret is assigned with -ENOMEM in this case. Link: https://lkml.kernel.org/r/20210309083904.24321-1-baijiaju1990@gmail.com Fixes: a43cac0d9dc2 ("kexec: split kexec_file syscall code to kexec_file.c") Signed-off-by: Jia-Ju Bai Reported-by: TOTE Robot Acked-by: Baoquan He Signed-off-by: Andrew Morton --- kernel/kexec_file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/kernel/kexec_file.c~kernel-kexec_file-fix-error-return-code-of-kexec_calculate_store_digests +++ a/kernel/kexec_file.c @@ -740,8 +740,10 @@ static int kexec_calculate_store_digests sha_region_sz = KEXEC_SEGMENT_MAX * sizeof(struct kexec_sha_region); sha_regions = vzalloc(sha_region_sz); - if (!sha_regions) + if (!sha_regions) { + ret = -ENOMEM; goto out_free_desc; + } desc->tfm = tfm; _