Merge drm/drm-next into drm-intel-next-queued

[linux-block.git] / drivers / gpu / drm / i915 / i915_query.c

diff --git a/drivers/gpu/drm/i915/i915_query.c b/drivers/gpu/drm/i915/i915_query.c
index 9a8fdd3ac6bd0dcbba310a0815974ed6716fbc32..c1ebda9b5627b2695df6b94e2b0809b802d30021 100644 (file)
--- a/drivers/gpu/drm/i915/i915_query.c
+++ b/drivers/gpu/drm/i915/i915_query.c
@@ -25,10 +25,6 @@ static int copy_query_item(void *query_hdr, size_t query_sz,
                           query_sz))
                return -EFAULT;
 
-       if (!access_ok(u64_to_user_ptr(query_item->data_ptr),
-                      total_length))
-               return -EFAULT;
-
        return 0;
 }
 
@@ -72,20 +68,20 @@ static int query_topology_info(struct drm_i915_private *dev_priv,
        topo.eu_offset = slice_length + subslice_length;
        topo.eu_stride = sseu->eu_stride;
 
-       if (__copy_to_user(u64_to_user_ptr(query_item->data_ptr),
+       if (copy_to_user(u64_to_user_ptr(query_item->data_ptr),
                           &topo, sizeof(topo)))
                return -EFAULT;
 
-       if (__copy_to_user(u64_to_user_ptr(query_item->data_ptr + sizeof(topo)),
+       if (copy_to_user(u64_to_user_ptr(query_item->data_ptr + sizeof(topo)),
                           &sseu->slice_mask, slice_length))
                return -EFAULT;
 
-       if (__copy_to_user(u64_to_user_ptr(query_item->data_ptr +
+       if (copy_to_user(u64_to_user_ptr(query_item->data_ptr +
                                           sizeof(topo) + slice_length),
                           sseu->subslice_mask, subslice_length))
                return -EFAULT;
 
-       if (__copy_to_user(u64_to_user_ptr(query_item->data_ptr +
+       if (copy_to_user(u64_to_user_ptr(query_item->data_ptr +
                                           sizeof(topo) +
                                           slice_length + subslice_length),
                           sseu->eu_mask, eu_length))
@@ -130,14 +126,14 @@ query_engine_info(struct drm_i915_private *i915,
                info.engine.engine_instance = engine->uabi_instance;
                info.capabilities = engine->uabi_capabilities;
 
-               if (__copy_to_user(info_ptr, &info, sizeof(info)))
+               if (copy_to_user(info_ptr, &info, sizeof(info)))
                        return -EFAULT;
 
                query.num_engines++;
                info_ptr++;
        }
 
-       if (__copy_to_user(query_ptr, &query, sizeof(query)))
+       if (copy_to_user(query_ptr, &query, sizeof(query)))
                return -EFAULT;
 
        return len;
@@ -157,10 +153,6 @@ static int can_copy_perf_config_registers_or_number(u32 user_n_regs,
        if (user_n_regs < kernel_n_regs)
                return -EINVAL;
 
-       if (!access_ok(u64_to_user_ptr(user_regs_ptr),
-                      2 * sizeof(u32) * kernel_n_regs))
-               return -EFAULT;
-
        return 0;
 }
 
@@ -169,6 +161,7 @@ static int copy_perf_config_registers_or_number(const struct i915_oa_reg *kernel
                                                u64 user_regs_ptr,
                                                u32 *user_n_regs)
 {
+       u32 __user *p = u64_to_user_ptr(user_regs_ptr);
        u32 r;
 
        if (*user_n_regs == 0) {
@@ -178,25 +171,19 @@ static int copy_perf_config_registers_or_number(const struct i915_oa_reg *kernel
 
        *user_n_regs = kernel_n_regs;
 
-       for (r = 0; r < kernel_n_regs; r++) {
-               u32 __user *user_reg_ptr =
-                       u64_to_user_ptr(user_regs_ptr + sizeof(u32) * r * 2);
-               u32 __user *user_val_ptr =
-                       u64_to_user_ptr(user_regs_ptr + sizeof(u32) * r * 2 +
-                                       sizeof(u32));
-               int ret;
-
-               ret = __put_user(i915_mmio_reg_offset(kernel_regs[r].addr),
-                                user_reg_ptr);
-               if (ret)
-                       return -EFAULT;
+       if (!user_write_access_begin(p, 2 * sizeof(u32) * kernel_n_regs))
+               return -EFAULT;
 
-               ret = __put_user(kernel_regs[r].value, user_val_ptr);
-               if (ret)
-                       return -EFAULT;
+       for (r = 0; r < kernel_n_regs; r++, p += 2) {
+               unsafe_put_user(i915_mmio_reg_offset(kernel_regs[r].addr),
+                               p, Efault);
+               unsafe_put_user(kernel_regs[r].value, p + 1, Efault);
        }
-
+       user_write_access_end();
        return 0;
+Efault:
+       user_write_access_end();
+       return -EFAULT;
 }
 
 static int query_perf_config_data(struct drm_i915_private *i915,
@@ -232,10 +219,7 @@ static int query_perf_config_data(struct drm_i915_private *i915,
                return -EINVAL;
        }
 
-       if (!access_ok(user_query_config_ptr, total_size))
-               return -EFAULT;
-
-       if (__get_user(flags, &user_query_config_ptr->flags))
+       if (get_user(flags, &user_query_config_ptr->flags))
                return -EFAULT;
 
        if (flags != 0)
@@ -248,7 +232,7 @@ static int query_perf_config_data(struct drm_i915_private *i915,
                BUILD_BUG_ON(sizeof(user_query_config_ptr->uuid) >= sizeof(uuid));
 
                memset(&uuid, 0, sizeof(uuid));
-               if (__copy_from_user(uuid, user_query_config_ptr->uuid,
+               if (copy_from_user(uuid, user_query_config_ptr->uuid,
                                     sizeof(user_query_config_ptr->uuid)))
                        return -EFAULT;
 
@@ -262,7 +246,7 @@ static int query_perf_config_data(struct drm_i915_private *i915,
                }
                rcu_read_unlock();
        } else {
-               if (__get_user(config_id, &user_query_config_ptr->config))
+               if (get_user(config_id, &user_query_config_ptr->config))
                        return -EFAULT;
 
                oa_config = i915_perf_get_oa_config(perf, config_id);
@@ -270,8 +254,7 @@ static int query_perf_config_data(struct drm_i915_private *i915,
        if (!oa_config)
                return -ENOENT;
 
-       if (__copy_from_user(&user_config, user_config_ptr,
-                            sizeof(user_config))) {
+       if (copy_from_user(&user_config, user_config_ptr, sizeof(user_config))) {
                ret = -EFAULT;
                goto out;
        }
@@ -317,8 +300,7 @@ static int query_perf_config_data(struct drm_i915_private *i915,
 
        memcpy(user_config.uuid, oa_config->uuid, sizeof(user_config.uuid));
 
-       if (__copy_to_user(user_config_ptr, &user_config,
-                          sizeof(user_config))) {
+       if (copy_to_user(user_config_ptr, &user_config, sizeof(user_config))) {
                ret = -EFAULT;
                goto out;
        }