3 files changed, 13 insertions, 17 deletions

diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c
index e2daa8f02476..bd41df95b6f0 100644
--- a/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@ -171,7 +171,7 @@ static ssize_t size_write(struct file *filp, const char __user *buf,
         int c;
 
         if (copy_from_user(lbuf, buf, sizeof(lbuf)))
-                return -EPERM;
+                return -EFAULT;
 
         c = order2idx(dev, ent->order);
         lbuf[sizeof(lbuf) - 1] = 0;
@@ -208,7 +208,7 @@ static ssize_t size_read(struct file *filp, char __user *buf, size_t count,
                 return err;
 
         if (copy_to_user(buf, lbuf, err))
-                return -EPERM;
+                return -EFAULT;
 
         *pos += err;
 
@@ -233,7 +233,7 @@ static ssize_t limit_write(struct file *filp, const char __user *buf,
         int c;
 
         if (copy_from_user(lbuf, buf, sizeof(lbuf)))
-                return -EPERM;
+                return -EFAULT;
 
         c = order2idx(dev, ent->order);
         lbuf[sizeof(lbuf) - 1] = 0;
@@ -270,7 +270,7 @@ static ssize_t limit_read(struct file *filp, char __user *buf, size_t count,
                 return err;
 
         if (copy_to_user(buf, lbuf, err))
-                return -EPERM;
+                return -EFAULT;
 
         *pos += err;
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
index c1c0eef89694..205753a04cfc 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
@@ -693,7 +693,7 @@ static ssize_t dbg_write(struct file *filp, const char __user *buf,
                 return -ENOMEM;
 
         if (copy_from_user(lbuf, buf, sizeof(lbuf)))
-                return -EPERM;
+                return -EFAULT;
 
         lbuf[sizeof(lbuf) - 1] = 0;
 
@@ -889,7 +889,7 @@ static ssize_t data_write(struct file *filp, const char __user *buf,
                 return -ENOMEM;
 
         if (copy_from_user(ptr, buf, count)) {
-                err = -EPERM;
+                err = -EFAULT;
                 goto out;
         }
         dbg->in_msg = ptr;
@@ -919,7 +919,7 @@ static ssize_t data_read(struct file *filp, char __user *buf, size_t count,
 
         copy = min_t(int, count, dbg->outlen);
         if (copy_to_user(buf, dbg->out_msg, copy))
-                return -EPERM;
+                return -EFAULT;
 
         *pos += copy;
 
@@ -949,7 +949,7 @@ static ssize_t outlen_read(struct file *filp, char __user *buf, size_t count,
                 return err;
 
         if (copy_to_user(buf, &outlen, err))
-                return -EPERM;
+                return -EFAULT;
 
         *pos += err;
 
@@ -974,7 +974,7 @@ static ssize_t outlen_write(struct file *filp, const char __user *buf,
         dbg->outlen = 0;
 
         if (copy_from_user(outlen_str, buf, count))
-                return -EPERM;
+                return -EFAULT;
 
         outlen_str[7] = 0;
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c b/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c
index a550a8ef94a1..4273c06e2e96 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c
@@ -148,7 +148,6 @@ static ssize_t average_read(struct file *filp, char __user *buf, size_t count,
         struct mlx5_cmd_stats *stats;
         u64 field = 0;
         int ret;
-        int err;
         char tbuf[22];
 
         if (*pos)
@@ -161,9 +160,8 @@ static ssize_t average_read(struct file *filp, char __user *buf, size_t count,
         spin_unlock(&stats->lock);
         ret = snprintf(tbuf, sizeof(tbuf), "%llu\n", field);
         if (ret > 0) {
-                err = copy_to_user(buf, tbuf, ret);
-                if (err)
-                        return err;
+                if (copy_to_user(buf, tbuf, ret))
+                        return -EFAULT;
         }
 
         *pos += ret;
@@ -418,7 +416,6 @@ static ssize_t dbg_read(struct file *filp, char __user *buf, size_t count,
         char tbuf[18];
         u64 field;
         int ret;
-        int err;
 
         if (*pos)
                 return 0;
@@ -445,9 +442,8 @@ static ssize_t dbg_read(struct file *filp, char __user *buf, size_t count,
 
         ret = snprintf(tbuf, sizeof(tbuf), "0x%llx\n", field);
         if (ret > 0) {
-                err = copy_to_user(buf, tbuf, ret);
-                if (err)
-                        return err;
+                if (copy_to_user(buf, tbuf, ret))
+                        return -EFAULT;
         }
 
         *pos += ret;