]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
RDS: IB: fix 'passing zero to ERR_PTR()' warning
authorYueHaibing <yuehaibing@huawei.com>
Tue, 7 Aug 2018 11:34:16 +0000 (19:34 +0800)
committerJuerg Haefliger <juergh@canonical.com>
Wed, 24 Jul 2019 01:46:43 +0000 (19:46 -0600)
BugLink: https://bugs.launchpad.net/bugs/1835972
[ Upstream commit 5941923da29e84bc9e2a1abb2c14fffaf8d71e2f ]

Fix a static code checker warning:
 net/rds/ib_frmr.c:82 rds_ib_alloc_frmr() warn: passing zero to 'ERR_PTR'

The error path for ib_alloc_mr failure should set err to PTR_ERR.

Fixes: 1659185fb4d0 ("RDS: IB: Support Fastreg MR (FRMR) memory registration mode")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
net/rds/ib_frmr.c

index 48332a6ed7383c51def7402dcfef1e581fa677f7..d290416e79e96d610e48a11e6e778102f4b147a5 100644 (file)
@@ -61,6 +61,7 @@ static struct rds_ib_mr *rds_ib_alloc_frmr(struct rds_ib_device *rds_ibdev,
                         pool->fmr_attr.max_pages);
        if (IS_ERR(frmr->mr)) {
                pr_warn("RDS/IB: %s failed to allocate MR", __func__);
+               err = PTR_ERR(frmr->mr);
                goto out_no_cigar;
        }