github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-01 03:45:29 +00:00
Code Issues Projects Releases Wiki Activity

DM: xHCI: Check trb pointer before use it

Browse Source 
The trb pointer may be NULL when get the address from user space, add
the pointer check before use the trb.

Tracked-On: #6172
Signed-off-by: Liu Long <long.liu@intel.com>
Reviewed-by: Shuo A Liu <shuo.a.liu@intel.com>
Acked-by: Yu Wang <yu1.wang@intel.com>
This commit is contained in:
Liu Long 2021-06-08 13:46:03 +08:00 committed by wenlingz
parent 4ea0d49a74
commit 211a961e18
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devicemodel/hw/pci/xhci.c
View File

@ -2627,6 +2627,10 @@ pci_xhci_complete_commands(struct pci_xhci_vdev *xdev)
trb = xdev->opregs.cr_p; trb = xdev->opregs.cr_p;
ccs = xdev->opregs.crcr & XHCI_CRCR_LO_RCS; ccs = xdev->opregs.crcr & XHCI_CRCR_LO_RCS;
crcr = xdev->opregs.crcr & ~0xF; crcr = xdev->opregs.crcr & ~0xF;
if (!trb) {
UPRINTF(LDBG, "Get the invalid guest address!\r\n");
goto out;
}
while (1) { while (1) {
xdev->opregs.cr_p = trb; xdev->opregs.cr_p = trb;
@ -2759,6 +2763,7 @@ pci_xhci_complete_commands(struct pci_xhci_vdev *xdev)
} }
} }
out:
xdev->opregs.crcr = crcr | (xdev->opregs.crcr & XHCI_CRCR_LO_CA) | ccs; xdev->opregs.crcr = crcr | (xdev->opregs.crcr & XHCI_CRCR_LO_CA) | ccs;
xdev->opregs.crcr &= ~XHCI_CRCR_LO_CRR; xdev->opregs.crcr &= ~XHCI_CRCR_LO_CRR;
return 0; return 0;