summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2021-05-14 17:18:10 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-26 12:06:49 +0200
commit7cf4decefa0558ca000f1b6f01336e211b9ed052 (patch)
tree8de4fc631a1607ebef2d881f4c0a87c535335805
parentc62c907ccc63b5ba59609ceecda1b04998d41962 (diff)
downloadlinux-stable-7cf4decefa0558ca000f1b6f01336e211b9ed052.tar.gz
linux-stable-7cf4decefa0558ca000f1b6f01336e211b9ed052.tar.bz2
linux-stable-7cf4decefa0558ca000f1b6f01336e211b9ed052.zip
RDMA/uverbs: Fix a NULL vs IS_ERR() bug
[ Upstream commit 463a3f66473b58d71428a1c3ce69ea52c05440e5 ] The uapi_get_object() function returns error pointers, it never returns NULL. Fixes: 149d3845f4a5 ("RDMA/uverbs: Add a method to introspect handles in a context") Link: https://lore.kernel.org/r/YJ6Got+U7lz+3n9a@mwanda Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Leon Romanovsky <leonro@nvidia.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/infiniband/core/uverbs_std_types_device.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/core/uverbs_std_types_device.c b/drivers/infiniband/core/uverbs_std_types_device.c
index a03021d94e11..049684880ae0 100644
--- a/drivers/infiniband/core/uverbs_std_types_device.c
+++ b/drivers/infiniband/core/uverbs_std_types_device.c
@@ -117,8 +117,8 @@ static int UVERBS_HANDLER(UVERBS_METHOD_INFO_HANDLES)(
return ret;
uapi_object = uapi_get_object(attrs->ufile->device->uapi, object_id);
- if (!uapi_object)
- return -EINVAL;
+ if (IS_ERR(uapi_object))
+ return PTR_ERR(uapi_object);
handles = gather_objects_handle(attrs->ufile, uapi_object, attrs,
out_len, &total);