Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 321d7863 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

IB/uverbs: Delete type and id from uverbs_obj_attr 



In this context the uobject is not allowed to be NULL, so type is the same
as uobject->type, and at least for IDR, id is the same as uobject->id.

FD objects should never handle the FD number outside the uAPI boundary
code.

Suggested-by: default avatarGuy Levi <guyle@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 4d7dff2b

drivers/infiniband/core/uverbs_ioctl.c

+2 −4
Original line number Diff line number Diff line
@@ -152,14 +152,12 @@ static int uverbs_process_attr(struct ib_device *ibdev, 
		object = uverbs_get_object(ibdev, spec->obj.obj_type);

		if (!object)

			return -EINVAL;

		o_attr->type = object->type_attrs;



		o_attr->id = (int)uattr->data;

		o_attr->uobject = uverbs_get_uobject_from_context(

					o_attr->type,

					object->type_attrs,

					ucontext,

					spec->obj.access,

					o_attr->id);

					(int)uattr->data);



		if (IS_ERR(o_attr->uobject))

			return PTR_ERR(o_attr->uobject);

include/rdma/uverbs_ioctl.h

+0 −4
Original line number Diff line number Diff line
@@ -344,11 +344,7 @@ struct uverbs_ptr_attr { 
};



struct uverbs_obj_attr {

	/* pointer to the kernel descriptor -> type, access, etc */

	const struct uverbs_obj_type	*type;

	struct ib_uobject		*uobject;

	/* fd or id in idr of this object */

	int				id;

};



struct uverbs_attr {