drm/asahi: Check command structure sizes

Eventually this can be used to extend the structure at the end backwards-compatibly, for cases where we missed core fields in the UAPI. More discrete features should be implemented via extensions. Signed-off-by: Asahi Lina <[email protected]>
AsahiLinux · Jan 17, 2024 · 5ccaf76 · 5ccaf76
1 parent db612a8
commit 5ccaf76
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/drivers/gpu/drm/asahi/queue/compute.rs b/drivers/gpu/drm/asahi/queue/compute.rs
@@ -55,6 +55,15 @@ impl super::Queue::ver {
 
         mod_dev_dbg!(self.dev, "[Submission {}] Compute!\n", id);
 
+        if cmd.cmd_buffer_size as usize != core::mem::size_of::<uapi::drm_asahi_cmd_compute>() {
+            cls_pr_debug!(
+                Errors,
+                "Invalid compute command size ({:#x})\n",
+                cmd.cmd_buffer_size
+            );
+            return Err(EINVAL);
+        }
+
         let mut cmdbuf_reader = unsafe {
             UserSlicePtr::new(
                 cmd.cmd_buffer as usize as *mut _,

diff --git a/drivers/gpu/drm/asahi/queue/render.rs b/drivers/gpu/drm/asahi/queue/render.rs
@@ -222,6 +222,15 @@ impl super::Queue::ver {
 
         mod_dev_dbg!(self.dev, "[Submission {}] Render!\n", id);
 
+        if cmd.cmd_buffer_size as usize  != core::mem::size_of::<uapi::drm_asahi_cmd_render>() {
+            cls_pr_debug!(
+                Errors,
+                "Invalid render command size ({:#x})\n",
+                cmd.cmd_buffer_size
+            );
+            return Err(EINVAL);
+        }
+
         let mut cmdbuf_reader = unsafe {
             UserSlicePtr::new(
                 cmd.cmd_buffer as usize as *mut _,