Skip to content

Commit

Permalink
RDMA/uverbs: Prohibit write() calls with too small buffers
Browse files Browse the repository at this point in the history
The size meta-data in the prior patch describes the smallest acceptable
buffer for the write() interface. Globally check this in the core code.

This is necessary in the case of write() methods that have a driver udata
to prevent computing a negative udata buffer length.

The return code of -ENOSPC is chosen here as some of the handlers already
use this code, however many other handler use EINVAL.

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
  • Loading branch information
Jason Gunthorpe committed Nov 26, 2018
1 parent 669dac1 commit da0f60d
Showing 1 changed file with 28 additions and 4 deletions.
32 changes: 28 additions & 4 deletions drivers/infiniband/core/uverbs_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -589,22 +589,28 @@ struct file *ib_uverbs_alloc_async_event_file(struct ib_uverbs_file *uverbs_file
}

static ssize_t verify_hdr(struct ib_uverbs_cmd_hdr *hdr,
struct ib_uverbs_ex_cmd_hdr *ex_hdr,
size_t count, bool extended)
struct ib_uverbs_ex_cmd_hdr *ex_hdr, size_t count,
const struct uverbs_api_write_method *method_elm)
{
if (extended) {
if (method_elm->is_ex) {
count -= sizeof(*hdr) + sizeof(*ex_hdr);

if ((hdr->in_words + ex_hdr->provider_in_words) * 8 != count)
return -EINVAL;

if (hdr->in_words * 8 < method_elm->req_size)
return -ENOSPC;

if (ex_hdr->cmd_hdr_reserved)
return -EINVAL;

if (ex_hdr->response) {
if (!hdr->out_words && !ex_hdr->provider_out_words)
return -EINVAL;

if (hdr->out_words * 8 < method_elm->resp_size)
return -ENOSPC;

if (!access_ok(VERIFY_WRITE,
u64_to_user_ptr(ex_hdr->response),
(hdr->out_words + ex_hdr->provider_out_words) * 8))
Expand All @@ -621,6 +627,24 @@ static ssize_t verify_hdr(struct ib_uverbs_cmd_hdr *hdr,
if (hdr->in_words * 4 != count)
return -EINVAL;

if (count < method_elm->req_size + sizeof(hdr)) {
/*
* rdma-core v18 and v19 have a bug where they send DESTROY_CQ
* with a 16 byte write instead of 24. Old kernels didn't
* check the size so they allowed this. Now that the size is
* checked provide a compatibility work around to not break
* those userspaces.
*/
if (hdr->command == IB_USER_VERBS_CMD_DESTROY_CQ &&
count == 16) {
hdr->in_words = 6;
return 0;
}
return -ENOSPC;
}
if (hdr->out_words * 4 < method_elm->resp_size)
return -ENOSPC;

return 0;
}

Expand Down Expand Up @@ -659,7 +683,7 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf,
return -EFAULT;
}

ret = verify_hdr(&hdr, &ex_hdr, count, method_elm->is_ex);
ret = verify_hdr(&hdr, &ex_hdr, count, method_elm);
if (ret)
return ret;

Expand Down

0 comments on commit da0f60d

Please sign in to comment.