diff options
| author |   Jason Gunthorpe <jgg@mellanox.com> | 2019-02-14 20:13:31 +0000 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2019-02-15 15:54:46 -0700 |
| commit | 9a7786784dcbec2f6ad52fd98a8d076f808e59f2 (patch) | |
| tree | def215304a1e823823d4b2e449b8d28b79e7a1e6 /drivers/infiniband/core | |
| parent | IB/{hw,sw}: Remove 'uobject->context' dependency in object creation APIs (diff) | |
| download | linux-dev-9a7786784dcbec2f6ad52fd98a8d076f808e59f2.tar.xz linux-dev-9a7786784dcbec2f6ad52fd98a8d076f808e59f2.zip | |
RDMA/uverbs: Fix an error flow in ib_uverbs_poll_cq
The new output_written block was wrongly placed before the ret=0, causing
the error code to be lost. uverbs_output_written is not expected to fail,
and even if it does fail it has no significant impact on the userspace
flow.
Reported-by: Bart Van Assche <bvanassche@acm.org>
Fixes: d6f4a21f309d ("RDMA/uverbs: Mark ioctl responses with UVERBS_ATTR_F_VALID_OUTPUT")
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Diffstat (limited to 'drivers/infiniband/core')
| -rw-r--r-- | drivers/infiniband/core/uverbs_cmd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c index c2e7733a7fe0..4947d1480c6d 100644 --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c @@ -1186,12 +1186,11 @@ static int ib_uverbs_poll_cq(struct uverbs_attr_bundle *attrs) ret = -EFAULT; goto out_put; } + ret = 0; if (uverbs_attr_is_valid(attrs, UVERBS_ATTR_CORE_OUT)) ret = uverbs_output_written(attrs, UVERBS_ATTR_CORE_OUT); - ret = 0; - out_put: uobj_put_obj_read(cq); return ret; |