@@ -25,10 +25,6 @@ static int copy_query_item(void *query_hdr, size_t query_sz,
2525 query_sz ))
2626 return - EFAULT ;
2727
28- if (!access_ok (u64_to_user_ptr (query_item -> data_ptr ),
29- total_length ))
30- return - EFAULT ;
31-
3228 return 0 ;
3329}
3430
@@ -72,20 +68,20 @@ static int query_topology_info(struct drm_i915_private *dev_priv,
7268 topo .eu_offset = slice_length + subslice_length ;
7369 topo .eu_stride = sseu -> eu_stride ;
7470
75- if (__copy_to_user (u64_to_user_ptr (query_item -> data_ptr ),
71+ if (copy_to_user (u64_to_user_ptr (query_item -> data_ptr ),
7672 & topo , sizeof (topo )))
7773 return - EFAULT ;
7874
79- if (__copy_to_user (u64_to_user_ptr (query_item -> data_ptr + sizeof (topo )),
75+ if (copy_to_user (u64_to_user_ptr (query_item -> data_ptr + sizeof (topo )),
8076 & sseu -> slice_mask , slice_length ))
8177 return - EFAULT ;
8278
83- if (__copy_to_user (u64_to_user_ptr (query_item -> data_ptr +
79+ if (copy_to_user (u64_to_user_ptr (query_item -> data_ptr +
8480 sizeof (topo ) + slice_length ),
8581 sseu -> subslice_mask , subslice_length ))
8682 return - EFAULT ;
8783
88- if (__copy_to_user (u64_to_user_ptr (query_item -> data_ptr +
84+ if (copy_to_user (u64_to_user_ptr (query_item -> data_ptr +
8985 sizeof (topo ) +
9086 slice_length + subslice_length ),
9187 sseu -> eu_mask , eu_length ))
@@ -131,14 +127,14 @@ query_engine_info(struct drm_i915_private *i915,
131127 info .engine .engine_instance = engine -> uabi_instance ;
132128 info .capabilities = engine -> uabi_capabilities ;
133129
134- if (__copy_to_user (info_ptr , & info , sizeof (info )))
130+ if (copy_to_user (info_ptr , & info , sizeof (info )))
135131 return - EFAULT ;
136132
137133 query .num_engines ++ ;
138134 info_ptr ++ ;
139135 }
140136
141- if (__copy_to_user (query_ptr , & query , sizeof (query )))
137+ if (copy_to_user (query_ptr , & query , sizeof (query )))
142138 return - EFAULT ;
143139
144140 return len ;
0 commit comments