lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 435/800] ehea: fix error return code in ehea_restart_qps()
    Date
    From: Zhen Lei <thunder.leizhen@huawei.com>

    [ 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 <hulkci@huawei.com>
    Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
    Link: https://lore.kernel.org/r/20210528085555.9390-1-thunder.leizhen@huawei.com
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/ibm/ehea/ehea_main.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
    index ea55314b209d..d105bfbc7c1c 100644
    --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
    +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
    @@ -2618,10 +2618,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];
    @@ -2641,6 +2639,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;
    }

    @@ -2653,6 +2652,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;
    }

    @@ -2661,6 +2661,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;
    }

    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 11:09    [W:3.144 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site