Skip to content

NetworkPkg/IScsiDxe:Fix for out of bound memory access for bz4207 (CVE-2024-38805) #11042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+24 −5
Open

NetworkPkg/IScsiDxe:Fix for out of bound memory access for bz4207 (CVE-2024-38805) #11042

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0eeb91
NetworkPkg/IScsiDxe:Fix for out of bound memory access for bz4207 (CV…
santhoshVenkat25 May 7, 2025
dffc8f1
Merge branch 'master' into master
santhoshVenkat25 May 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions NetworkPkg/IScsiDxe/IScsiProto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1880,6 +1880,8 @@ IScsiBuildKeyValueList (
{
LIST_ENTRY *ListHead;
ISCSI_KEY_VALUE_PAIR *KeyValuePair;
EFI_STATUS Status;
UINT32 Result;

ListHead = AllocatePool (sizeof (LIST_ENTRY));
if (ListHead == NULL) {
Expand All @@ -1903,9 +1905,14 @@ IScsiBuildKeyValueList (
Data++;
}

if (*Data == '=') {
// Here Len must not be zero.
// The value of Len is size of data buffer. Actually, Data is make up of strings.
// AuthMethod=None\0TargetAlias=LIO Target\0 TargetPortalGroupTag=1\0
// (1) Len == 0, *Data != '=' goto ON_ERROR
// (2) *Data == '=', Len != 0 normal case.
// (3) *Data == '=', Len == 0, Between Data and Len are mismatch, Len isn't all size of data, as error.
if ((Len > 0) && (*Data == '=')) {
*Data = '\0';

Data++;
Len--;
} else {
Expand All @@ -1915,10 +1922,22 @@ IScsiBuildKeyValueList (

KeyValuePair->Value = Data;

InsertTailList (ListHead, &KeyValuePair->List);
Status = SafeUint32Add ((UINT32)AsciiStrLen (KeyValuePair->Value), 1, &Result);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a Memory Overflow is Detected.\n", __func__));
FreePool (KeyValuePair);
goto ON_ERROR;
}

Data += AsciiStrLen (KeyValuePair->Value) + 1;
Len -= (UINT32)AsciiStrLen (KeyValuePair->Value) + 1;
Status = SafeUint32Sub (Len, Result, &Len);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a Out of bound memory access Detected.\n", __func__));
FreePool (KeyValuePair);
goto ON_ERROR;
}

InsertTailList (ListHead, &KeyValuePair->List);
Data += Result;
}

return ListHead;
Expand Down
Loading