Patch "drm/xe/xe_devcoredump: Check NULL before assignments" has been added to the 6.9-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    drm/xe/xe_devcoredump: Check NULL before assignments

to the 6.9-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-xe-xe_devcoredump-check-null-before-assignments.patch
and it can be found in the queue-6.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 85e6bfa961da053b0446e0578c9ba7b31fefc8fe
Author: Himal Prasad Ghimiray <himal.prasad.ghimiray@xxxxxxxxx>
Date:   Thu Mar 28 18:07:39 2024 +0530

    drm/xe/xe_devcoredump: Check NULL before assignments
    
    [ Upstream commit b15e65349553b1689d15fbdebea874ca5ae2274a ]
    
    Assign 'xe_devcoredump_snapshot *' and 'xe_device *' only if
    'coredump' is not NULL.
    
    v2
    - Fix commit messages.
    
    v3
    - Define variables before code.(Ashutosh/Jose)
    
    v4
    - Drop return check for coredump_to_xe. (Jose/Rodrigo)
    
    v5
    - Modify misleading commit message. (Matt)
    
    Cc: Matt Roper <matthew.d.roper@xxxxxxxxx>
    Cc: Ashutosh Dixit <ashutosh.dixit@xxxxxxxxx>
    Cc: José Roberto de Souza <jose.souza@xxxxxxxxx>
    Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
    Signed-off-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@xxxxxxxxx>
    Reviewed-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
    Reviewed-by: José Roberto de Souza <jose.souza@xxxxxxxxx>
    Link: https://patchwork.freedesktop.org/patch/msgid/20240328123739.3633428-1-himal.prasad.ghimiray@xxxxxxxxx
    Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/gpu/drm/xe/xe_devcoredump.c b/drivers/gpu/drm/xe/xe_devcoredump.c
index 68d3d623a05bf..ccec291b02ccd 100644
--- a/drivers/gpu/drm/xe/xe_devcoredump.c
+++ b/drivers/gpu/drm/xe/xe_devcoredump.c
@@ -74,17 +74,19 @@ static ssize_t xe_devcoredump_read(char *buffer, loff_t offset,
 				   size_t count, void *data, size_t datalen)
 {
 	struct xe_devcoredump *coredump = data;
-	struct xe_device *xe = coredump_to_xe(coredump);
-	struct xe_devcoredump_snapshot *ss = &coredump->snapshot;
+	struct xe_device *xe;
+	struct xe_devcoredump_snapshot *ss;
 	struct drm_printer p;
 	struct drm_print_iterator iter;
 	struct timespec64 ts;
 	int i;
 
-	/* Our device is gone already... */
-	if (!data || !coredump_to_xe(coredump))
+	if (!coredump)
 		return -ENODEV;
 
+	xe = coredump_to_xe(coredump);
+	ss = &coredump->snapshot;
+
 	/* Ensure delayed work is captured before continuing */
 	flush_work(&ss->work);