1 files changed, 11 insertions, 1 deletions

diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index b3e437b3bb54..c19e669ffe50 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -42,7 +42,7 @@ find_section(const void *_bdb, int section_id)
         const struct bdb_header *bdb = _bdb;
         const u8 *base = _bdb;
         int index = 0;
-        u16 total, current_size;
+        u32 total, current_size;
         u8 current_id;
 
         /* skip to first section */
@@ -57,6 +57,10 @@ find_section(const void *_bdb, int section_id)
                 current_size = *((const u16 *)(base + index));
                 index += 2;
 
+                /* The MIPI Sequence Block v3+ has a separate size field. */
+                if (current_id == BDB_MIPI_SEQUENCE && *(base + index) >= 3)
+                        current_size = *((const u32 *)(base + index + 1));
+
                 if (index + current_size > total)
                         return NULL;
 
@@ -799,6 +803,12 @@ parse_mipi(struct drm_i915_private *dev_priv, const struct bdb_header *bdb)
                 return;
         }
 
+        /* Fail gracefully for forward incompatible sequence block. */
+        if (sequence->version >= 3) {
+                DRM_ERROR("Unable to parse MIPI Sequence Block v3+\n");
+                return;
+        }
+
         DRM_DEBUG_DRIVER("Found MIPI sequence block\n");
 
         block_size = get_blocksize(sequence);