0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch 2.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748
  1. From 59aa67f7a4d8efc564b46fe467aaf6eccec17183 Mon Sep 17 00:00:00 2001
  2. From: Gerd Hoffmann <kraxel@redhat.com>
  3. Date: Mon, 20 Dec 2021 22:32:38 +0800
  4. Subject: [PATCH] MdeModulePkg/UsbBusDxe: fix NOOPT build error
  5. gcc-11 (fedora 35):
  6. /home/kraxel/projects/edk2/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c: In function ?UsbIoBulkTransfer?:
  7. /home/kraxel/projects/edk2/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c:277:12: error: ?UsbHcBulkTransfer? accessing 80 bytes in a region of size 8 [-Werror=stringop-overflow=]
  8. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
  9. Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
  10. (cherry picked from commit ae8272ef787d80950803c521a13a308651bdc62e)
  11. Signed-off-by: Romain Naour <romain.naour@gmail.com>
  12. ---
  13. MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c | 2 +-
  14. MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h | 2 +-
  15. 2 files changed, 2 insertions(+), 2 deletions(-)
  16. diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
  17. index 7529e03e85..b2ce97ca37 100644
  18. --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
  19. +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
  20. @@ -285,7 +285,7 @@ UsbHcBulkTransfer (
  21. IN UINT8 DevSpeed,
  22. IN UINTN MaxPacket,
  23. IN UINT8 BufferNum,
  24. - IN OUT VOID *Data[EFI_USB_MAX_BULK_BUFFER_NUM],
  25. + IN OUT VOID *Data[],
  26. IN OUT UINTN *DataLength,
  27. IN OUT UINT8 *DataToggle,
  28. IN UINTN TimeOut,
  29. diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h
  30. index 1d2b8a6174..1316a5981f 100644
  31. --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h
  32. +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h
  33. @@ -149,7 +149,7 @@ UsbHcBulkTransfer (
  34. IN UINT8 DevSpeed,
  35. IN UINTN MaxPacket,
  36. IN UINT8 BufferNum,
  37. - IN OUT VOID *Data[EFI_USB_MAX_BULK_BUFFER_NUM],
  38. + IN OUT VOID *Data[],
  39. IN OUT UINTN *DataLength,
  40. IN OUT UINT8 *DataToggle,
  41. IN UINTN TimeOut,
  42. --
  43. 2.35.3