From patchwork Mon Jul 12 06:08:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 472897 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2656388jao; Sun, 11 Jul 2021 23:43:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyoNipBAz9+oUQrGxWKdPqoJt/eFIRSAhMzJ8G9Kayr63bpih+HQLnzNyTiPnMpip/ZkMm9 X-Received: by 2002:aa7:ca44:: with SMTP id j4mr12430219edt.203.1626072213128; Sun, 11 Jul 2021 23:43:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626072213; cv=none; d=google.com; s=arc-20160816; b=VAgrmiyaV5ZmDgGIRoi9P2NKupRQrIXVwiVa87GzIHMmfWOBUV3Dm6b34SF0+d0rkM p3S54xcR6e66tarZIdZtf8PipM8YZAINNblyytoUAqjmYMyo5I7hX3qQedIrKu2G+MFI AdqO7toBaMF9GajcPcmAqNJV/jD1yT+5rUwhb/SxpKFqtgZWqxM3JgYM64xJkVxBpHMm VUGuS1NV8mGF4iNRWxtWY/8/uVgf+5s01BNPMnaqBKgSHQyyVN3xFUE0h+CuzcnhP284 Q+xS8Sab29zSLM1RYYgyCOGVkFC2Pv2NuNBYTgdDOdLgXsgHGl2+NA3G4eG2WVPqfcQp kWLg== 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=95kxd0fjP71jV6AwBGa2bO6l9rAnVRvBOBmYhaJzJYQ=; b=y3iip/8zpXSZz4Y3K6UCVB8+s2fx1bozGRxENz3/++X5CsBoyQO15mFK5k6/hDgxoe mJkvfaGcj1czUGfurvfj4AFO28jwkDexvuL0Mf6qamdqe1edZ/M8opqzirVchExoY0hL uPmhcCNazWoxfty3+orO82qvNe3gomUYNXs8EYcHD7tzMfT7toPc0k7bb4+duxNvGmIM PO1ve0M5+X8D6MKLF3bJNFE75r1Fs/qQca1CNfDDGAFLOxMLjnvfPvwY7ftxrJbvlpxq ZTW1IL48oMDjwxyhBrUGPKwhFd3s0eoerb/kRA8/1OVn8t+sfoZUcD0N6FTJn5CFDjRI LpZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=t+QJmdhL; 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 en10si16062540ejc.118.2021.07.11.23.43.32; Sun, 11 Jul 2021 23:43:33 -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=t+QJmdhL; 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 S235845AbhGLGpm (ORCPT + 12 others); Mon, 12 Jul 2021 02:45:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:36804 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239106AbhGLGos (ORCPT ); Mon, 12 Jul 2021 02:44:48 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6363E611C1; Mon, 12 Jul 2021 06:40:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626072041; bh=MCwjGlUhMs9fRJNOMQKclYgS0+8CWreKuf7GuCiuqT4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t+QJmdhLov3aIxT8cp+ooDbHejE+DEtBTX4FT6orzyDehMhKNqwGSqNN56P9tsrcG m3Q/6rIM/rPJDASaV1SyuLRiqibYAYC+nSo3Eges19lxQJOUvs2a1Nt/ZV3mqP3DJs jU2N59V+rWPWfc/h5FM51b7psnsPF9qN0aimwXQo= 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 5.10 328/593] ehea: fix error return code in ehea_restart_qps() Date: Mon, 12 Jul 2021 08:08:08 +0200 Message-Id: <20210712060921.835284510@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060843.180606720@linuxfoundation.org> References: <20210712060843.180606720@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 c2e740475786..f63066736425 100644 --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c @@ -2617,10 +2617,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]; @@ -2640,6 +2638,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; } @@ -2652,6 +2651,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; } @@ -2660,6 +2660,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; }