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

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

RDMA/uverbs: Refactor flags checks and update return value 



Since commit f21519b2 ("IB/core: extended command: an
improved infrastructure for uverbs commands"), the uverbs
supports extra flags as an input to the command interface.

However actually, there is only one flag available and used,
so it is better to refactor the code, so the resolution and
report to the users is done as early as possible.

As part of this change, we changed the return value of failure case
from ENOSYS to be EINVAL to be consistent with the rest flags checks.

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

drivers/infiniband/core/uverbs_main.c

+6 −4
Original line number Diff line number Diff line
@@ -701,6 +701,11 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, 
		 IB_USER_VERBS_CMD_FLAGS_MASK) >> IB_USER_VERBS_CMD_FLAGS_SHIFT;



	extended_command = flags & IB_USER_VERBS_CMD_FLAG_EXTENDED;

	if (flags & ~IB_USER_VERBS_CMD_FLAG_EXTENDED) {

		ret = -EINVAL;

		goto out;

	}



	if (!verify_command_idx(command, extended_command)) {

		ret = -EINVAL;

		goto out;
@@ -732,8 +737,7 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, 
						 buf + sizeof(hdr),

						 hdr.in_words * 4,

						 hdr.out_words * 4);



	} else if (flags == IB_USER_VERBS_CMD_FLAG_EXTENDED) {

	} else {

		struct ib_uverbs_ex_cmd_hdr ex_hdr;

		struct ib_udata ucore;

		struct ib_udata uhw;
@@ -804,8 +808,6 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, 
		ret = uverbs_ex_cmd_table[command](file, ib_dev, &ucore, &uhw);

		if (!ret)

			ret = written_count;

	} else {

		ret = -ENOSYS;

	}



out: