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

Commit 491d5c6a authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Doug Ledford
Browse files

RDMA/uverbs: Move uncontext check before SRCU read lock 



There is no need to take SRCU lock before checking
file->ucontext, so move it do it before it.

Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent eb455e32

drivers/infiniband/core/uverbs_main.c

+4 −11
Original line number Diff line number Diff line
@@ -705,6 +705,10 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, 
	if (ret)

		return ret;



	if (!file->ucontext &&

	    (command != IB_USER_VERBS_CMD_GET_CONTEXT || extended))

		return -EINVAL;



	if (extended && count < (sizeof(hdr) + sizeof(ex_hdr)))

		return -EINVAL;
@@ -721,12 +725,6 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, 
		goto out;

	}



	if (!file->ucontext &&

	    command != IB_USER_VERBS_CMD_GET_CONTEXT) {

		ret = -EINVAL;

		goto out;

	}



	if (!extended) {

		if (hdr.in_words * 4 != count) {

			ret = -EINVAL;
@@ -742,11 +740,6 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, 
		struct ib_udata uhw;

		size_t written_count = count;



		if (!file->ucontext) {

			ret = -EINVAL;

			goto out;

		}



		if (copy_from_user(&ex_hdr, buf + sizeof(hdr), sizeof(ex_hdr))) {

			ret = -EFAULT;

			goto out;