Skip to content

Xhci DMA buffer Allocation fix #1539

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 1 commit into
base: release/202502
Choose a base branch
from
+54 −6
Open

Xhci DMA buffer Allocation fix #1539

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 54 additions & 6 deletions MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1427,6 +1427,7 @@ XhciDelAsyncIntTransfer (
LIST_ENTRY *Next;
URB *Urb;
VOID *UrbData;
UINTN DataLen; // MU_CHANGE
EFI_USB_DATA_DIRECTION Direction;
EFI_STATUS Status;

Expand Down Expand Up @@ -1456,9 +1457,19 @@ XhciDelAsyncIntTransfer (
// and allocates and manages its own data buffer, so free it here.
//
UrbData = Urb->Data;
DataLen = Urb->DataLen; // MU_CHANGE
XhcFreeUrb (Xhc, Urb);
if (UrbData != NULL) {
FreePool (UrbData);
// MU_CHANGE [BEGIN]
Status = Xhc->PciIo->FreeBuffer (Xhc->PciIo, EFI_SIZE_TO_PAGES (DataLen), UrbData);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a: failed to free buffer via PciIo\n", __func__));
ASSERT_EFI_ERROR (Status);
return EFI_SUCCESS;
}

// FreePool (UrbData);
// MU_CHANGE [END]
}

return EFI_SUCCESS;
Expand All @@ -1483,6 +1494,7 @@ XhciDelAllAsyncIntTransfers (
LIST_ENTRY *Next;
URB *Urb;
VOID *UrbData;
UINTN DataLen; // MU_CHANGE
EFI_STATUS Status;

BASE_LIST_FOR_EACH_SAFE (Entry, Next, &Xhc->AsyncIntTransfers) {
Expand All @@ -1503,9 +1515,17 @@ XhciDelAllAsyncIntTransfers (
// and allocates and manages its own data buffer, so free it here.
//
UrbData = Urb->Data;
DataLen = Urb->DataLen; // MU_CHANGE
XhcFreeUrb (Xhc, Urb);
if (UrbData != NULL) {
FreePool (UrbData);
// MU_CHANGE [BEGIN]
Status = Xhc->PciIo->FreeBuffer (Xhc->PciIo, EFI_SIZE_TO_PAGES (DataLen), UrbData);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a: failed to free buffer via PciIo\n", __func__));
}

// FreePool (UrbData);
// MU_CHANGE [END]
}
}
}
Expand Down Expand Up @@ -1541,12 +1561,33 @@ XhciInsertAsyncIntTransfer (
VOID *Data;
URB *Urb;

Data = AllocateZeroPool (DataLen);
if (Data == NULL) {
DEBUG ((DEBUG_ERROR, "%a: failed to allocate buffer\n", __func__));
// MU_CHANGE [BEGIN]
EFI_STATUS Status;

Data = NULL;

Status = Xhc->PciIo->AllocateBuffer (
Xhc->PciIo,
AllocateAnyPages,
EfiBootServicesData,
EFI_SIZE_TO_PAGES (DataLen),
&Data,
0
);
if (EFI_ERROR (Status) || (Data == NULL)) {
DEBUG ((DEBUG_ERROR, "%a: failed to allocate buffer via PciIo\n", __func__));
return NULL;
}

ZeroMem (Data, DataLen);

// Data = AllocateZeroPool (DataLen);
// if (Data == NULL) {
// DEBUG ((DEBUG_ERROR, "%a: failed to allocate buffer\n", __func__));
// return NULL;
// }
// MU_CHANGE [END]

Urb = XhcCreateUrb (
Xhc,
BusAddr,
Expand All @@ -1562,7 +1603,14 @@ XhciInsertAsyncIntTransfer (
);
if (Urb == NULL) {
DEBUG ((DEBUG_ERROR, "%a: failed to create URB\n", __func__));
FreePool (Data);
// MU_CHANGE [BEGIN]
Status = Xhc->PciIo->FreeBuffer (Xhc->PciIo, EFI_SIZE_TO_PAGES (DataLen), Data);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a: failed to free buffer via PciIo\n", __func__));
}

// FreePool (Data);
// MU_CHANGE [END]
return NULL;
}

Expand Down