From patchwork Mon Jul 19 14:48:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 479924 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4238819jao; Mon, 19 Jul 2021 08:36:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrqsr2KvGxvmQNOVFVcMVtEulWp9d9/Pp+P7STY9wlt+YGJpy9PeMBdHJFaRSAnXJgMpDc X-Received: by 2002:a5e:8c07:: with SMTP id n7mr13286987ioj.26.1626708989831; Mon, 19 Jul 2021 08:36:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626708989; cv=none; d=google.com; s=arc-20160816; b=BKOxq52BLM5pDhaIG7G6+ouLtE6jdopmrr7iQe33Nh4zeu+tkyeFDDuEks9JsgMyO0 SVhxVuKmEN9YLbcaRA6DCJ7iVXXG3sVlNhU5Lp5otk2v3eHnCL+JOT6+mDAMZspHWzi/ OP2dRC1YCVl/aao4XsnRTHv2tJjBkK/6FnQygft1XcOuLzGktBOOsF1M/0TJm5QtQUJd HJqMWgxwhIrjbjioELfSomRGMD/6V+swUh0Lmk5EzE5sujpGVHtVKxLzW39+PsV84/Lz AI/KN5TF79EsViPQSATz+jwewxVh8W477NyrSvv2RQNUFaIkePRXtditDkH7+Af9CYqz hc7Q== 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=RTj0fcQfAEhgLj8vdu+qt5Qy5YsP1uVFy2WtgK+u3P8=; b=KnOqgrEuziHRMKCcpdmcQT6uCEb6+piPlyu400n2LQ31DYeiD1jw7ltt4U4Qtse2b9 CYuUowMybZXoF8sGbc7e1v3WQAPX/q0O56UQqvHcVNOhemv1A+JGoaJ3KTOyboDTQ5Y0 65LrB4X4CgRUDxl2bNTqIxftEX5AhHk2HWM2wkzPzORZA+ZEjOJtR+Q11eDupvYW8tS3 S5+ewMBb9hgn6QyPAMgzJ4CHeKPVQngPfkjZ+bjAzQz1s/jLaG+U9ojMag62RUOlkh+2 qzCGvfboX6OzeoRzIomxSTFXT8qBZQyZvca9vhxGpmjgiRtD4q6XThxAvHs2y8vh1HER cS5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=aLpOf6mo; 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 h5si23669220iol.44.2021.07.19.08.36.29; Mon, 19 Jul 2021 08:36:29 -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=aLpOf6mo; 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 S238492AbhGSOzn (ORCPT + 12 others); Mon, 19 Jul 2021 10:55:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:44744 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237982AbhGSOxl (ORCPT ); Mon, 19 Jul 2021 10:53:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 61DF960551; Mon, 19 Jul 2021 15:32:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626708766; bh=DeG7i+76F7AJFMGFaOh3M8ESVyWt6KLkW092qo7Bwxs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aLpOf6mou26As2zlo6X14Dhwq+W/3qvaZj8rl/EpGgup4vs/yth2tMvwxW0k6dZoB hS9WKbGp0fDiy3nvn1S/llhClIkZzyHedbK92Kn5jdc2Eoxvz13xv4hG5C/kzM/WHX FyOaEh5qrx/Ik/Yf1R8pOurwjCWZppay+kzcIRoA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Zhen Lei , Jakub Kicinski , Sasha Levin Subject: [PATCH 4.19 123/421] ehea: fix error return code in ehea_restart_qps() Date: Mon, 19 Jul 2021 16:48:54 +0200 Message-Id: <20210719144950.809483869@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144946.310399455@linuxfoundation.org> References: <20210719144946.310399455@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 015dbf5662fd689d581c0bc980711b073ca09a1a ] Fix to return -EFAULT from the error handling case instead of 0, as done elsewhere in this function. By the way, when get_zeroed_page() fails, directly return -ENOMEM to simplify code. Fixes: 2c69448bbced ("ehea: DLPAR memory add fix") Reported-by: Hulk Robot Signed-off-by: Zhen Lei Link: https://lore.kernel.org/r/20210528085555.9390-1-thunder.leizhen@huawei.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/ibm/ehea/ehea_main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 2.30.2 diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c index 0f799e8e093c..5a1fe49030b1 100644 --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c @@ -2636,10 +2636,8 @@ static int ehea_restart_qps(struct net_device *dev) u16 dummy16 = 0; cb0 = (void *)get_zeroed_page(GFP_KERNEL); - if (!cb0) { - ret = -ENOMEM; - goto out; - } + if (!cb0) + return -ENOMEM; for (i = 0; i < (port->num_def_qps); i++) { struct ehea_port_res *pr = &port->port_res[i]; @@ -2659,6 +2657,7 @@ static int ehea_restart_qps(struct net_device *dev) cb0); if (hret != H_SUCCESS) { netdev_err(dev, "query_ehea_qp failed (1)\n"); + ret = -EFAULT; goto out; } @@ -2671,6 +2670,7 @@ static int ehea_restart_qps(struct net_device *dev) &dummy64, &dummy16, &dummy16); if (hret != H_SUCCESS) { netdev_err(dev, "modify_ehea_qp failed (1)\n"); + ret = -EFAULT; goto out; } @@ -2679,6 +2679,7 @@ static int ehea_restart_qps(struct net_device *dev) cb0); if (hret != H_SUCCESS) { netdev_err(dev, "query_ehea_qp failed (2)\n"); + ret = -EFAULT; goto out; }