From: Abner Chang <abner.ch...@amd.com>
Refine SMBIOS 42h code add mode debug message
for the error conditions.
Signed-off-by: Abner Chang <abner.ch...@amd.com>
Cc: Nickle Wang <nick...@nvidia.com>
Cc: Igor Kulchytskyy <ig...@ami.com>
Cc: Mike Maslenkin <mike.maslen...@gmail.com>
---
.../RedfishDiscoverInternal.h | 2 ++
.../RedfishSmbiosHostInterface.c | 20 +++++++++++++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverInternal.h
b/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverInternal.h
index e27cfa76e39..de7faa4f975 100644
--- a/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverInternal.h
+++ b/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverInternal.h
@@ -42,6 +42,8 @@
#define MAC_COMPARE(This, Target) (CompareMem ((VOID *)&(This)->MacAddress,
&(Target)->MacAddress, (This)->HwAddressSize) == 0)
#define VALID_TCP6(Target, This) ((Target)->IsIpv6 &&
((This)->NetworkProtocolType == ProtocolTypeTcp6))
#define VALID_TCP4(Target, This) (!(Target)->IsIpv6 &&
((This)->NetworkProtocolType == ProtocolTypeTcp4))
+#define REDFISH_HI_ITERFACE_SPECIFIC_DATA_LENGTH_OFFSET
((UINT16)(UINTN)(&((SMBIOS_TABLE_TYPE42 *)0)->InterfaceTypeSpecificDataLength))
+#define REDFISH_HI_PROTOCOL_HOSTNAME_LENGTH_OFFSET
((UINT16)(UINTN)(&((REDFISH_OVER_IP_PROTOCOL_DATA
*)0)->RedfishServiceHostnameLength))
//
// GUID definitions
diff --git a/RedfishPkg/RedfishDiscoverDxe/RedfishSmbiosHostInterface.c
b/RedfishPkg/RedfishDiscoverDxe/RedfishSmbiosHostInterface.c
index 0d6edc7dc35..57665f367be 100644
--- a/RedfishPkg/RedfishDiscoverDxe/RedfishSmbiosHostInterface.c
+++ b/RedfishPkg/RedfishDiscoverDxe/RedfishSmbiosHostInterface.c
@@ -56,7 +56,7 @@ RedfishGetHostInterfaceProtocolData (
mType42Record = (SMBIOS_TABLE_TYPE42 *)Record;
if (mType42Record->InterfaceType ==
MCHostInterfaceTypeNetworkHostInterface) {
ASSERT (Record->Length >= 9);
- Offset = 5;
+ Offset = REDFISH_HI_ITERFACE_SPECIFIC_DATA_LENGTH_OFFSET;
RecordTmp = (UINT8 *)Record + Offset;
//
// Get interface specific data length.
@@ -70,11 +70,13 @@ RedfishGetHostInterfaceProtocolData (
//
if ((*RecordTmp == REDFISH_HOST_INTERFACE_DEVICE_TYPE_PCI_PCIE_V2) ||
(*RecordTmp == REDFISH_HOST_INTERFACE_DEVICE_TYPE_USB_V2)) {
if (*RecordTmp == REDFISH_HOST_INTERFACE_DEVICE_TYPE_PCI_PCIE_V2) {
+ // According to Redfish Host Interface specification, add
additional one byte for Device Type field.
if (SpecificDataLen != sizeof
(PCI_OR_PCIE_INTERFACE_DEVICE_DESCRIPTOR_V2) + 1) {
ASSERT (SpecificDataLen == sizeof
(PCI_OR_PCIE_INTERFACE_DEVICE_DESCRIPTOR_V2) + 1);
return EFI_VOLUME_CORRUPTED;
}
} else {
+ // According to Redfish Host Interface specification, add
additional one byte for Device Type field.
if (SpecificDataLen != sizeof (USB_INTERFACE_DEVICE_DESCRIPTOR_V2)
+ 1) {
ASSERT (SpecificDataLen == sizeof
(USB_INTERFACE_DEVICE_DESCRIPTOR_V2) + 1);
return EFI_VOLUME_CORRUPTED;
@@ -105,7 +107,14 @@ RedfishGetHostInterfaceProtocolData (
// This SMBIOS record is invalid, if the length of protocol
specific data for
// Redfish Over IP protocol is wrong.
//
- if ((*(RecordTmp + 90) + sizeof (REDFISH_OVER_IP_PROTOCOL_DATA) -
1) != ProtocolLength) {
+ if ((*(RecordTmp + REDFISH_HI_PROTOCOL_HOSTNAME_LENGTH_OFFSET) +
sizeof (REDFISH_OVER_IP_PROTOCOL_DATA) - 1) != ProtocolLength) {
+ DEBUG ((
+ DEBUG_ERROR,
+ "%a: Length of protocol specific data is not match: %d !=
ProtocolLength(%d).\n",
+ __func__,
+ *(RecordTmp + REDFISH_HI_PROTOCOL_HOSTNAME_LENGTH_OFFSET) +
sizeof (REDFISH_OVER_IP_PROTOCOL_DATA) - 1,
+ ProtocolLength
+ ));
return EFI_SECURITY_VIOLATION;
}
@@ -114,6 +123,13 @@ RedfishGetHostInterfaceProtocolData (
// This SMBIOS record is invalid, if the length is smaller than
the offset.
//
if (Offset > mType42Record->Hdr.Length) {
+ DEBUG ((
+ DEBUG_ERROR,
+ "%a: Offset (%d) > mType42Record->Hdr.Length (%d).\n",
+ __func__,
+ Offset,
+ mType42Record->Hdr.Length
+ ));
return EFI_SECURITY_VIOLATION;
}
--
2.37.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#111662): https://edk2.groups.io/g/devel/message/111662
Mute This Topic: https://groups.io/mt/102763124/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
