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: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index 8d1547f5dc8e9fef55fc94d31d029238cc7d68dc..20797a1c77f350d24915e63adc812fe7fffc0784 100644 (file)
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -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;