2 files changed, 15 insertions, 2 deletions

diff --git a/drivers/scsi/megaraid/megaraid_sas_fp.c b/drivers/scsi/megaraid/megaraid_sas_fp.c
index 7cae1c25c9a9..4f72287860ee 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fp.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fp.c
@@ -212,6 +212,9 @@ void MR_PopulateDrvRaidMap(struct megasas_instance *instance)
                 for (i = 0; i < MAX_RAIDMAP_LOGICAL_DRIVES + MAX_RAIDMAP_VIEWS; i++)
                         pDrvRaidMap->ldTgtIdToLd[i] =
                                 (u8)pFwRaidMap->ldTgtIdToLd[i];
+                for (i = (MAX_RAIDMAP_LOGICAL_DRIVES + MAX_RAIDMAP_VIEWS);
+                        i < MAX_LOGICAL_DRIVES_EXT; i++)
+                        pDrvRaidMap->ldTgtIdToLd[i] = 0xff;
                 for (i = 0; i < ld_count; i++) {
                         pDrvRaidMap->ldSpanMap[i] = pFwRaidMap->ldSpanMap[i];
 #if VD_EXT_DEBUG
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index af5ab9e5e8e5..7b23d347b69c 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -1725,9 +1725,19 @@ megasas_build_dcdb_fusion(struct megasas_instance *instance,
                 if (scmd->device->channel < MEGASAS_MAX_PD_CHANNELS)
                         goto NonFastPath;
 
+                /*
+                 * For older firmware, Driver should not access ldTgtIdToLd
+                 * beyond index 127 and for Extended VD firmware, ldTgtIdToLd
+                 * should not go beyond 255.
+                 */
+
+                if ((!fusion->fast_path_io) ||
+                        (device_id >= instance->fw_supported_vd_count))
+                        goto NonFastPath;
+
                 ld = MR_TargetIdToLdGet(device_id, local_map_ptr);
-                if ((ld >= instance->fw_supported_vd_count) ||
-                        (!fusion->fast_path_io))
+
+                if (ld >= instance->fw_supported_vd_count)
                         goto NonFastPath;
 
                 raid = MR_LdRaidGet(ld, local_map_ptr);