From patchwork Mon May 17 14:02:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 440114 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp1151383jac; Mon, 17 May 2021 07:40:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCHENsQiMwqIs2yjzyE/olQIUEO/ZJtKuOIIIXIfUPZEe4j4Q7GTTT7V1uLiTGveSLDhch X-Received: by 2002:a17:906:3bc6:: with SMTP id v6mr236221ejf.165.1621262414570; Mon, 17 May 2021 07:40:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621262414; cv=none; d=google.com; s=arc-20160816; b=gD7Q2Lmmb/ts31UgBIiGRXxDFH9Of1GrpA/9HPYpC2b5Vw90irtZQQR7OTwmKWmChK J+A7wBwi/oPgLd2HfFA08QKcE9vx/TU6Z61vsafaKP5ybhPTWK3ScQptyQ1Sdn9AFuA8 wMNIxAM3BNoB0ei7xkXtCyfyyV1qZyZpbScnjfSE0mDvaNSNFKk9TObRhd6PKpWMKYJa IQhoLN+HzXI6xOvZhw1HZiKcCnCf8oJRhkQQSS83B9Mv484IhvSTw6D8L6qXx4GPLot+ O9r03itjsumDeQzCxfZtVFK/ikHXAkyh/SvrioU+L6kXblnL0Cchpbhw/SnyAsajRQo3 rGOw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zW+nrnAK3bWNRUYc7pumsK4HAb8fPpcxwkv62nQol+k=; b=JqLWYlbpTvRcrilEIFeFjkQfREr9U9moQZF0typOcxzxVMVDrl8sbkVUgniGuoPXFM msvNTiwjz//uSzDL9oDJevVU4fDGChb4eIB1T2R7bIDtMxsjUWG6bpxILTD+x92KDvmw zYtSuCFUUfd4EnBMkySfzCgllwo1FjqyPNQXr650OCRTcmG+GPy9DLCJYEutTdMeYpw5 HSGCBHv4k8v/+iK9sbpp98ynACSTQl3sNWJ1+6V5E+SxmAQH/ny6XKTDYuPlxhuMzSWL cACBod17kDeIrhPeFRA3DuM1N1HNRKDCLQnrcivx7NjblI2Z06j7z3a1RXVyw5UFn+zz ZYLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=W4jCnL4z; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z16si1110219edd.136.2021.05.17.07.40.14; Mon, 17 May 2021 07:40:14 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=W4jCnL4z; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240678AbhEQOl2 (ORCPT + 12 others); Mon, 17 May 2021 10:41:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:34024 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240924AbhEQOjV (ORCPT ); Mon, 17 May 2021 10:39:21 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A5AE16193A; Mon, 17 May 2021 14:18:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621261111; bh=fngY5Z8pt3dkBwALJzRZGtAqNPMwfFVcNbPbxtMCDN4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W4jCnL4zh/UPR9S+LKrduebgELYomGlIahNPV6PhPGviv+y1lLrO6LlNnfABWGRWV Is6CSpAB2n3qDNrlXBY3p0sw60CDKDPArZ/YBtw9YB+klh9fN7qxY2Yt4JVcPbqA2b LsuYQpwPFUICl/Mgiaj3xmdOfohEXmfDVmDseqPA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Zhen Lei , Juergen Gross , Sasha Levin Subject: [PATCH 5.12 283/363] xen/unpopulated-alloc: fix error return code in fill_list() Date: Mon, 17 May 2021 16:02:29 +0200 Message-Id: <20210517140312.174948868@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517140302.508966430@linuxfoundation.org> References: <20210517140302.508966430@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhen Lei [ Upstream commit dbc03e81586fc33e4945263fd6e09e22eb4b980f ] Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Fixes: a4574f63edc6 ("mm/memremap_pages: convert to 'struct range'") Reported-by: Hulk Robot Signed-off-by: Zhen Lei Reviewed-by: Juergen Gross Link: https://lore.kernel.org/r/20210508021913.1727-1-thunder.leizhen@huawei.com Signed-off-by: Juergen Gross Signed-off-by: Sasha Levin --- drivers/xen/unpopulated-alloc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.30.2 diff --git a/drivers/xen/unpopulated-alloc.c b/drivers/xen/unpopulated-alloc.c index e64e6befc63b..87e6b7db892f 100644 --- a/drivers/xen/unpopulated-alloc.c +++ b/drivers/xen/unpopulated-alloc.c @@ -39,8 +39,10 @@ static int fill_list(unsigned int nr_pages) } pgmap = kzalloc(sizeof(*pgmap), GFP_KERNEL); - if (!pgmap) + if (!pgmap) { + ret = -ENOMEM; goto err_pgmap; + } pgmap->type = MEMORY_DEVICE_GENERIC; pgmap->range = (struct range) {