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

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

RDMA/uverbs: Unify return values of not supported command 



The non-existing command is supposed to return -EOPNOTSUPP, but the
current code returns different errors for different flows for the
same failure. This patch unifies those flows.

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

drivers/infiniband/core/uverbs_main.c

+4 −12
Original line number Diff line number Diff line
@@ -653,9 +653,11 @@ static bool verify_command_mask(struct ib_device *ib_dev, __u32 command) 
static bool verify_command_idx(u32 command, bool extended)

{

	if (extended)

		return command < ARRAY_SIZE(uverbs_ex_cmd_table);

		return command < ARRAY_SIZE(uverbs_ex_cmd_table) &&

		       uverbs_ex_cmd_table[command];



	return command < ARRAY_SIZE(uverbs_cmd_table);

	return command < ARRAY_SIZE(uverbs_cmd_table) &&

	       uverbs_cmd_table[command];

}



static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf,
@@ -730,11 +732,6 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, 
	}



	if (!flags) {

		if (!uverbs_cmd_table[command]) {

			ret = -EINVAL;

			goto out;

		}



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

			ret = -EINVAL;

			goto out;
@@ -749,11 +746,6 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, 
		struct ib_udata uhw;

		size_t written_count = count;



		if (!uverbs_ex_cmd_table[command]) {

			ret = -ENOSYS;

			goto out;

		}



		if (!file->ucontext) {

			ret = -EINVAL;

			goto out;