IB/rdmavt: return proper error code
Subsystems (2)
PATCH v3 1/1 IB/rdmavt: return proper error code
The commit 'ff23dfa13457' modified rvt_create_mmap_info() to return error code and also NULL but missed fixing codes which called rvt_create_mmap_info(). Modify rvt_create_mmap_info() to only return errorcode and fix error checking after rvt_create_mmap_info() was called.
Fixes ff23dfa13457 ("IB: Pass only ib_udata in function prototypes")
Cc [email protected] [5.4+]
Tested-by Mike Marciniszyn <[email protected]>
Acked-by Mike Marciniszyn <[email protected]>
Signed-off-by Sudip Mukherjee <[email protected]>
--- drivers/infiniband/sw/rdmavt/cq.c | 4 ++-- drivers/infiniband/sw/rdmavt/mmap.c | 4 ++-- drivers/infiniband/sw/rdmavt/qp.c | 4 ++-- drivers/infiniband/sw/rdmavt/srq.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-)
drivers/infiniband/sw/rdmavt/cq.c +2 -2
@@ -248,8 +248,8 @@ int rvt_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,*/ if (udata && udata->outlen >=sizeof (__u64)) { cq->ip =rvt_create_mmap_info (rdi, sz, udata, u_wc); -if (!cq->ip) { - err = -ENOMEM ; +if (IS_ERR (cq->ip)) { + err =PTR_ERR (cq->ip); goto bail_wc; }
drivers/infiniband/sw/rdmavt/mmap.c +2 -2
@@ -154,7 +154,7 @@ int rvt_mmap(struct ib_ucontext *context, struct vm_area_struct *vma)* @udata: user data (must be valid!) * @obj: opaque pointer to a cq, wq etc * -* Return: rvt_mmap struct on success +* Return: rvt_mmap struct on success, ERR_PTR on failure */ struct rvt_mmap_info *rvt_create_mmap_info (struct rvt_dev_info *rdi,u32 size,struct ib_udata *udata,void *obj)
@@ -166,7 +166,7 @@ struct rvt_mmap_info *rvt_create_mmap_info(struct rvt_dev_info *rdi, u32 size, ip =kmalloc_node (sizeof (*ip),GFP_KERNEL , rdi->dparms.node);if (!ip) -return ip; +return ERR_PTR (-ENOMEM ); size =PAGE_ALIGN (size);
drivers/infiniband/sw/rdmavt/qp.c +2 -2
@@ -1244,8 +1244,8 @@ struct ib_qp *rvt_create_qp(struct ib_pd *ibpd, qp->ip =rvt_create_mmap_info (rdi, s, udata, qp->r_rq.wq); -if (!qp->ip) { - ret =ERR_PTR (-ENOMEM ); +if (IS_ERR (qp->ip)) { + ret =ERR_CAST (qp->ip); goto bail_qpn; }
drivers/infiniband/sw/rdmavt/srq.c +2 -2
@@ -111,8 +111,8 @@ int rvt_create_srq(struct ib_srq *ibsrq, struct ib_srq_init_attr *srq_init_attr,u32 s =sizeof (struct rvt_rwq ) + srq->rq.size * sz; srq->ip =rvt_create_mmap_info (dev, s, udata, srq->rq.wq); -if (!srq->ip) { - ret = -ENOMEM ; +if (IS_ERR (srq->ip)) { + ret =PTR_ERR (srq->ip); goto bail_wq; }
Signature · 1 line
2.11.0
Jason Gunthorpe
AppliedQuoted 11 lines · Sudip Mukherjee
The commit '
ff23dfa13457' modifiedrvt_create_mmap_info()to return error code and also NULL but missed fixing codes which calledrvt_create_mmap_info(). Modifyrvt_create_mmap_info()to only return errorcode and fix error checking afterrvt_create_mmap_info()was called.Fixes ff23dfa13457 ("IB: Pass only ib_udata in function prototypes")Cc [email protected] [5.4+]Tested-by Mike Marciniszyn <[email protected]>Acked-by Mike Marciniszyn <[email protected]>Signed-off-by Sudip Mukherjee <[email protected]>
Quoted 6 lines
--- drivers/infiniband/sw/rdmavt/cq.c | 4 ++-- drivers/infiniband/sw/rdmavt/mmap.c | 4 ++-- drivers/infiniband/sw/rdmavt/qp.c | 4 ++-- drivers/infiniband/sw/rdmavt/srq.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-)
Applied to for-next, thanks
Jason