Re: [PATCH v2] MdeModulePkg: XhciDxe: Prevent illegal memory access in XhcSetHsee

[Ard Biesheuvel <ard.biesheuvel@linaro.org>]

On Wed, 26 Sep 2018 at 02:36, Zeng, Star <star.zeng@intel.com> wrote:
>
> Just pushed it at e5cd809087e5710e019d2766fab13c59a2e2ac28.
> Really thanks.
>

FYI this patch fixes the issue with my PCIe Renesas uPD70201 XHCI
controller as well.


> -----Original Message-----
> From: Zeng, Star
> Sent: Wednesday, September 26, 2018 8:30 AM
> To: Marcin Wojtas <mw@semihalf.com>; edk2-devel@lists.01.org
> Cc: Tian, Feng <feng.tian@intel.com>; Kinney, Michael D <michael.d.kinney@intel.com>; Gao, Liming <liming.gao@intel.com>; leif.lindholm@linaro.org; ard.biesheuvel@linaro.org; nadavh@marvell.com; jsd@semihalf.com; jaz@semihalf.com; Ni, Ruiyu <ruiyu.ni@intel.com>; Wang, Fei1 <fei1.wang@intel.com>; Zeng, Star <star.zeng@intel.com>
> Subject: RE: [PATCH v2] MdeModulePkg: XhciDxe: Prevent illegal memory access in XhcSetHsee
>
> Good observation.
>
> Reviewed-by: Star Zeng <star.zeng@intel.com>
>
>
> Thanks,
> Star
> -----Original Message-----
> From: Marcin Wojtas [mailto:mw@semihalf.com]
> Sent: Wednesday, September 26, 2018 5:58 AM
> To: edk2-devel@lists.01.org
> Cc: Tian, Feng <feng.tian@intel.com>; Kinney, Michael D <michael.d.kinney@intel.com>; Gao, Liming <liming.gao@intel.com>; leif.lindholm@linaro.org; ard.biesheuvel@linaro.org; nadavh@marvell.com; mw@semihalf.com; jsd@semihalf.com; jaz@semihalf.com; Ni, Ruiyu <ruiyu.ni@intel.com>; Wang, Fei1 <fei1.wang@intel.com>; Zeng, Star <star.zeng@intel.com>
> Subject: [PATCH v2] MdeModulePkg: XhciDxe: Prevent illegal memory access in XhcSetHsee
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1206
>
> Newly added XhcSetHsee() routine reads 4 bytes into a UINT16 variable causing issues on PCIE and NonDiscoverable Xhci controllers. Fix that.
>
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Fei1 Wang <fei1.wang@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> ---
>  MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c
> index 89f073e..3ed1a55 100644
> --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c
> +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c
> @@ -609,7 +609,7 @@ XhcSetHsee (
>                          PciIo,
>                          EfiPciIoWidthUint16,
>                          PCI_COMMAND_OFFSET,
> -                        sizeof (XhciCmd),
> +                        sizeof (XhciCmd) / sizeof (UINT16),
>                          &XhciCmd
>                          );
>    if (!EFI_ERROR (Status)) {
> --
> 2.7.4
>