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

Commit eaebc7d2 authored by Eli Cohen's avatar Eli Cohen Committed by Doug Ledford
Browse files

IB/core: Modify conditional on ucontext existence 



Since we allow to call legacy verbs using their extended counterpart,
the check on ucontext has to move up to a common area in case this verb
is ever extended.

Signed-off-by: default avatarEli Cohen <eli@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 2dbd5186

drivers/infiniband/core/uverbs_main.c

+6 −6
Original line number Diff line number Diff line
@@ -735,6 +735,12 @@ 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;

	}



	flags = (hdr.command &

		 IB_USER_VERBS_CMD_FLAGS_MASK) >> IB_USER_VERBS_CMD_FLAGS_SHIFT;
@@ -745,12 +751,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 (hdr.in_words * 4 != count) {

			ret = -EINVAL;

			goto out;