| Message ID | 20191011133419.GA22905@mwanda (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | a9018adfde809d44e71189b984fa61cc89682b5e |
| Delegated to: | Jason Gunthorpe |
| Headers | show |
| Series | [v2] uverbs: prevent potential underflow | expand |
On Fri, Oct 11, 2019 at 04:34:19PM +0300, Dan Carpenter wrote: > The issue is in drivers/infiniband/core/uverbs_std_types_cq.c in the > UVERBS_HANDLER(UVERBS_METHOD_CQ_CREATE) function. We check that: > > if (attr.comp_vector >= attrs->ufile->device->num_comp_vectors) { > > But we don't check that "attr.comp_vector" whether negative. It > could potentially lead to an array underflow. My concern would be where > cq->vector is used in the create_cq() function from the cxgb4 driver. > > And really "attr.comp_vector" is appears as a u32 to user space so that's > the right type to use. > > Fixes: 9ee79fce3642 ("IB/core: Add completion queue (cq) object actions") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > v2: Change both types to u32 > > drivers/infiniband/core/uverbs.h | 2 +- > include/rdma/ib_verbs.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to for-rc, thanks Jason
diff --git a/drivers/infiniband/core/uverbs.h b/drivers/infiniband/core/uverbs.h index 1e5aeb39f774..63f7f7db5902 100644 --- a/drivers/infiniband/core/uverbs.h +++ b/drivers/infiniband/core/uverbs.h @@ -98,7 +98,7 @@ ib_uverbs_init_udata_buf_or_null(struct ib_udata *udata, struct ib_uverbs_device { atomic_t refcount; - int num_comp_vectors; + u32 num_comp_vectors; struct completion comp; struct device dev; /* First group for device attributes, NULL terminated array */ diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 6a47ba85c54c..e7e733add99f 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -366,7 +366,7 @@ struct ib_tm_caps { struct ib_cq_init_attr { unsigned int cqe; - int comp_vector; + u32 comp_vector; u32 flags; };
The issue is in drivers/infiniband/core/uverbs_std_types_cq.c in the UVERBS_HANDLER(UVERBS_METHOD_CQ_CREATE) function. We check that: if (attr.comp_vector >= attrs->ufile->device->num_comp_vectors) { But we don't check that "attr.comp_vector" whether negative. It could potentially lead to an array underflow. My concern would be where cq->vector is used in the create_cq() function from the cxgb4 driver. And really "attr.comp_vector" is appears as a u32 to user space so that's the right type to use. Fixes: 9ee79fce3642 ("IB/core: Add completion queue (cq) object actions") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- v2: Change both types to u32 drivers/infiniband/core/uverbs.h | 2 +- include/rdma/ib_verbs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)