From: Greg Kroah-Hartman Date: Mon, 29 Jul 2024 09:59:54 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v6.1.103~85 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d615f002568409df868304ab4ea82aec41ec0426;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: drm-amd-display-check-for-null-pointer.patch scsi-qla2xxx-fix-optrom-version-displayed-in-fdmi.patch --- diff --git a/queue-5.15/drm-amd-display-check-for-null-pointer.patch b/queue-5.15/drm-amd-display-check-for-null-pointer.patch new file mode 100644 index 00000000000..c370900a2e8 --- /dev/null +++ b/queue-5.15/drm-amd-display-check-for-null-pointer.patch @@ -0,0 +1,38 @@ +From 4ab68e168ae1695f7c04fae98930740aaf7c50fa Mon Sep 17 00:00:00 2001 +From: Sung Joon Kim +Date: Mon, 8 Jul 2024 19:29:49 -0400 +Subject: drm/amd/display: Check for NULL pointer + +From: Sung Joon Kim + +commit 4ab68e168ae1695f7c04fae98930740aaf7c50fa upstream. + +[why & how] +Need to make sure plane_state is initialized +before accessing its members. + +Cc: Mario Limonciello +Cc: Alex Deucher +Cc: stable@vger.kernel.org +Reviewed-by: Xi (Alex) Liu +Signed-off-by: Sung Joon Kim +Signed-off-by: Aurabindo Pillai +Signed-off-by: Alex Deucher +(cherry picked from commit 295d91cbc700651782a60572f83c24861607b648) +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/amd/display/dc/core/dc_surface.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_surface.c +@@ -154,7 +154,8 @@ const struct dc_plane_status *dc_plane_g + if (pipe_ctx->plane_state != plane_state) + continue; + +- pipe_ctx->plane_state->status.is_flip_pending = false; ++ if (pipe_ctx->plane_state) ++ pipe_ctx->plane_state->status.is_flip_pending = false; + + break; + } diff --git a/queue-5.15/scsi-qla2xxx-fix-optrom-version-displayed-in-fdmi.patch b/queue-5.15/scsi-qla2xxx-fix-optrom-version-displayed-in-fdmi.patch new file mode 100644 index 00000000000..1341baf8840 --- /dev/null +++ b/queue-5.15/scsi-qla2xxx-fix-optrom-version-displayed-in-fdmi.patch @@ -0,0 +1,35 @@ +From 348744f27a35e087acc9378bf53537fbfb072775 Mon Sep 17 00:00:00 2001 +From: Shreyas Deodhar +Date: Wed, 10 Jul 2024 22:40:54 +0530 +Subject: scsi: qla2xxx: Fix optrom version displayed in FDMI + +From: Shreyas Deodhar + +commit 348744f27a35e087acc9378bf53537fbfb072775 upstream. + +Bios version was popluated for FDMI response. Systems with EFI would show +optrom version as 0. EFI version is populated here and BIOS version is +already displayed under FDMI_HBA_BOOT_BIOS_NAME. + +Cc: stable@vger.kernel.org +Signed-off-by: Shreyas Deodhar +Signed-off-by: Nilesh Javali +Link: https://lore.kernel.org/r/20240710171057.35066-9-njavali@marvell.com +Reviewed-by: Himanshu Madhani +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman +--- + drivers/scsi/qla2xxx/qla_gs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/scsi/qla2xxx/qla_gs.c ++++ b/drivers/scsi/qla2xxx/qla_gs.c +@@ -1709,7 +1709,7 @@ qla2x00_hba_attributes(scsi_qla_host_t * + eiter->type = cpu_to_be16(FDMI_HBA_OPTION_ROM_VERSION); + alen = scnprintf( + eiter->a.orom_version, sizeof(eiter->a.orom_version), +- "%d.%02d", ha->bios_revision[1], ha->bios_revision[0]); ++ "%d.%02d", ha->efi_revision[1], ha->efi_revision[0]); + alen += FDMI_ATTR_ALIGNMENT(alen); + alen += FDMI_ATTR_TYPELEN(eiter); + eiter->len = cpu_to_be16(alen); diff --git a/queue-5.15/series b/queue-5.15/series index 764fe24db0c..a1a1e6ab1de 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -180,3 +180,5 @@ hfs-fix-to-initialize-fields-of-hfs_inode_info-after-hfs_alloc_inode.patch ext2-verify-bitmap-and-itable-block-numbers-before-using-them.patch drm-gma500-fix-null-pointer-dereference-in-cdv_intel_lvds_get_modes.patch drm-gma500-fix-null-pointer-dereference-in-psb_intel_lvds_get_modes.patch +scsi-qla2xxx-fix-optrom-version-displayed-in-fdmi.patch +drm-amd-display-check-for-null-pointer.patch