]> www.infradead.org Git - users/hch/configfs.git/commitdiff
drm/xe: Fix possible UAF in guc_exec_queue_process_msg
authorMatthew Brost <matthew.brost@intel.com>
Wed, 24 Jul 2024 16:43:41 +0000 (09:43 -0700)
committerMatthew Brost <matthew.brost@intel.com>
Wed, 24 Jul 2024 20:41:01 +0000 (13:41 -0700)
Store xe_device ahead of processing message as message can be free'd in
some cases.

v2:
 - Including missing local changes
v3:
 - Resend for CI

Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/r/202407231445.rpisd1vA-lkp@intel.com/
Fixes: d930c19fdff3 ("drm/xe: Build PM into GuC CT layer")
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240724164341.1848954-1-matthew.brost@intel.com
drivers/gpu/drm/xe/xe_guc_submit.c

index a4570631926f6f7df2151a3d86c8dc1093563818..4608085079474908fa2365414a35a40251e3e213 100644 (file)
@@ -1389,6 +1389,8 @@ static void __guc_exec_queue_process_msg_resume(struct xe_sched_msg *msg)
 
 static void guc_exec_queue_process_msg(struct xe_sched_msg *msg)
 {
+       struct xe_device *xe = guc_to_xe(exec_queue_to_guc(msg->private_data));
+
        trace_xe_sched_msg_recv(msg);
 
        switch (msg->opcode) {
@@ -1408,7 +1410,7 @@ static void guc_exec_queue_process_msg(struct xe_sched_msg *msg)
                XE_WARN_ON("Unknown message type");
        }
 
-       xe_pm_runtime_put(guc_to_xe(exec_queue_to_guc(msg->private_data)));
+       xe_pm_runtime_put(xe);
 }
 
 static const struct drm_sched_backend_ops drm_sched_ops = {