Commit 4ce719f8 authored by Jason Gunthorpe's avatar Jason Gunthorpe

IB/uverbs: Do not check for device disassociation during ioctl

Now that the ioctl path and uobjects are converted to use uverbs_api, it
is now safe to remove the disassociation protection from the common ioctl
code.

This completes the work to make destroy functions continue to work even
after device disassociation.
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 51d0a2b4
...@@ -470,47 +470,32 @@ static int ib_uverbs_cmd_verbs(struct ib_uverbs_file *ufile, ...@@ -470,47 +470,32 @@ static int ib_uverbs_cmd_verbs(struct ib_uverbs_file *ufile,
return ret; return ret;
} }
#define IB_UVERBS_MAX_CMD_SZ 4096
long ib_uverbs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) long ib_uverbs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{ {
struct ib_uverbs_file *file = filp->private_data; struct ib_uverbs_file *file = filp->private_data;
struct ib_uverbs_ioctl_hdr __user *user_hdr = struct ib_uverbs_ioctl_hdr __user *user_hdr =
(struct ib_uverbs_ioctl_hdr __user *)arg; (struct ib_uverbs_ioctl_hdr __user *)arg;
struct ib_uverbs_ioctl_hdr hdr; struct ib_uverbs_ioctl_hdr hdr;
struct ib_device *ib_dev;
int srcu_key; int srcu_key;
long err; int err;
srcu_key = srcu_read_lock(&file->device->disassociate_srcu); if (unlikely(cmd != RDMA_VERBS_IOCTL))
ib_dev = srcu_dereference(file->device->ib_dev, return -ENOIOCTLCMD;
&file->device->disassociate_srcu);
if (!ib_dev) {
err = -EIO;
goto out;
}
if (cmd == RDMA_VERBS_IOCTL) {
err = copy_from_user(&hdr, user_hdr, sizeof(hdr)); err = copy_from_user(&hdr, user_hdr, sizeof(hdr));
if (err)
return -EFAULT;
if (err || hdr.length > IB_UVERBS_MAX_CMD_SZ || if (hdr.length > PAGE_SIZE ||
hdr.length != sizeof(hdr) + hdr.num_attrs * sizeof(struct ib_uverbs_attr)) { hdr.length != struct_size(&hdr, attrs, hdr.num_attrs))
err = -EINVAL; return -EINVAL;
goto out;
}
if (hdr.reserved1 || hdr.reserved2) { if (hdr.reserved1 || hdr.reserved2)
err = -EPROTONOSUPPORT; return -EPROTONOSUPPORT;
goto out;
}
srcu_key = srcu_read_lock(&file->device->disassociate_srcu);
err = ib_uverbs_cmd_verbs(file, &hdr, user_hdr->attrs); err = ib_uverbs_cmd_verbs(file, &hdr, user_hdr->attrs);
} else {
err = -ENOIOCTLCMD;
}
out:
srcu_read_unlock(&file->device->disassociate_srcu, srcu_key); srcu_read_unlock(&file->device->disassociate_srcu, srcu_key);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment