Changeset 88643 in vbox for trunk/src/VBox/Devices

Timestamp:

Apr 22, 2021 7:57:03 AM (4 years ago)

Author:

vboxsync

Message:

Devices/Storage/DevLsiLogicSCSI: Fix crashing on NULL pointer dereference during device construction when the SAS variant is used (regression from r143802), bugref:9914

Location:

trunk/src/VBox/Devices/Storage

Files:

• DevLsiLogicSCSI.cpp (modified) (1 diff)
• DevLsiLogicSCSI.h (modified) (2 diffs)

trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp

@@ -3678 +3678 @@
     LogFlowFunc(("pThis=%#p\n", pThis));
 
-    /* Clear everything first. */
     AssertPtrReturnVoid(pThisCC->pConfigurationPages);
     PMptConfigurationPagesSupported pPages = pThisCC->pConfigurationPages;
-    memset(pPages, 0, sizeof(MptConfigurationPagesSupported));
 
     /* Manufacturing Page 0. */

trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.h

@@ -3327 +3327 @@
 
 #define MPT_CONFIG_PAGE_HEADER_INIT_MANUFACTURING(pg, type, nr, flags) \
+    RT_ZERO(*pg); \
     MPT_CONFIG_PAGE_HEADER_INIT(pg, type, nr, flags | MPT_CONFIGURATION_PAGE_TYPE_MANUFACTURING)
 
 #define MPT_CONFIG_PAGE_HEADER_INIT_IO_UNIT(pg, type, nr, flags) \
+    RT_ZERO(*pg); \
     MPT_CONFIG_PAGE_HEADER_INIT(pg, type, nr, flags | MPT_CONFIGURATION_PAGE_TYPE_IO_UNIT)
 
 #define MPT_CONFIG_PAGE_HEADER_INIT_IOC(pg, type, nr, flags) \
+    RT_ZERO(*pg); \
     MPT_CONFIG_PAGE_HEADER_INIT(pg, type, nr, flags | MPT_CONFIGURATION_PAGE_TYPE_IOC)
 
 #define MPT_CONFIG_PAGE_HEADER_INIT_BIOS(pg, type, nr, flags) \
+    RT_ZERO(*pg); \
     MPT_CONFIG_PAGE_HEADER_INIT(pg, type, nr, flags | MPT_CONFIGURATION_PAGE_TYPE_BIOS)
 
@@ -3342 +3346 @@
  */
 #define MPT_CONFIG_EXTENDED_PAGE_HEADER_INIT(pg, cb, nr, flags, exttype) \
+    RT_BZERO(pg, cb); \
     (pg)->u.fields.ExtHeader.u8PageType   = (flags) | MPT_CONFIGURATION_PAGE_TYPE_EXTENDED; \
     (pg)->u.fields.ExtHeader.u8PageNumber = (nr); \