From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=AsxH/ZUO; spf=pass (domain: linaro.org, ip: 209.85.128.67, mailfrom: ard.biesheuvel@linaro.org) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by groups.io with SMTP; Wed, 25 Sep 2019 08:57:13 -0700 Received: by mail-wm1-f67.google.com with SMTP id 3so5556986wmi.3 for ; Wed, 25 Sep 2019 08:57:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=TToFwiPDV4LNHwCKkTYKDFcHUp1KIiOLh5A3bridQrY=; b=AsxH/ZUOiVU5kWjeKPdzDGl2VlkZVO38nhE+Cwx3HmvhhJig5Bp0V6zzKbjb6OulaW Hk8F7/ps2SO1WNT+KTHrNo/Q2wsV0eFn1sDgJQzhT7itpl78uUvMGH5Gh9LP8Z2GAfq0 anA+TtGE9PATHQMySflEmS6DJnSVb8bzfun+DBMsQQIZ8pPyza1l0q2VvNR8MYKOBERK 7dA4B1VXrtyt1oK9pZiRwWxa0OpvPZJAxaA3IAAFKaRO2d5NvG0zrV/PUuByDSTNcTwZ gLLq4g8swWEcdDFlbGC+N6bGTo8uojPFY9S7pQ6qhIY4t/ayrI+gJVZctJe+E4jEZ2t0 L81w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=TToFwiPDV4LNHwCKkTYKDFcHUp1KIiOLh5A3bridQrY=; b=KDwwPdFlxkZfToxk3e1NB+WQ5NZbRIMu5RsqkhqOjqg+ShSAN0yUl0bXCBz/TGsVdv aKVgsEH0lRxuOjiAWeKssYv/Kl7lwkPh8MGaaCHcWXU25Enh022qlCCvsW64T1D1fKYr zSrJ1oXyJO3CBbsMpzxh+C842YBgQ0jYhTkrMK+KDZnOT7uX+WZ94/Kdg0qMP44Uae0n to314yAfGifc4gdHcXTRKuhSRlVnjTcKOL41VGgWVp3641T95ma702uO6zWqEzO46x+S wTg771h4w6vs/NWKe+TqaF0HKnH62xflPrRaK8QtFwqUwzTO/2DUGtlSU90fjERo3j3s BFSg== X-Gm-Message-State: APjAAAW0Sry86D1mxyNAWZdEh700BO63ExvpmIISNyv6o1WcWS7lukri nvrC1GhCMpHdZYp/X38VADNAo/KUeR7d2IYX7eimdA== X-Google-Smtp-Source: APXvYqzLN0Y0xX9rGiwskgJFs1PqEy5n06R3j8M6KEvzGIFC7Oi94RW/Qn+jobsWZ1OuxTNDfdirUxDUOE9wo9rtc18= X-Received: by 2002:a1c:2546:: with SMTP id l67mr8781436wml.10.1569427032158; Wed, 25 Sep 2019 08:57:12 -0700 (PDT) MIME-Version: 1.0 References: <20190917194935.24322-1-lersek@redhat.com> <20190917194935.24322-25-lersek@redhat.com> In-Reply-To: <20190917194935.24322-25-lersek@redhat.com> From: "Ard Biesheuvel" Date: Wed, 25 Sep 2019 17:57:00 +0200 Message-ID: Subject: Re: [PATCH 24/35] OvmfPkg/PlatformDxe: fix EFI_HII_HANDLE parameters of internal functions To: Laszlo Ersek Cc: edk2-devel-groups-io , Jordan Justen Content-Type: text/plain; charset="UTF-8" On Tue, 17 Sep 2019 at 21:50, Laszlo Ersek wrote: > > In the following call tree: > > PlatformInit () > mInstalledPackages = HiiAddPackages () > GopInstalled () > PopulateForm (PackageList = mInstalledPackages) > CreateResolutionOptions (PackageList) > HiiSetString (PackageList > HiiUpdateForm (PackageList) > > PlatformDxe passes around an EFI_HII_HANDLE that (a) originates from > HiiAddPackages() and (b) is ultimately passed to HiiSetString() and > HiiUpdateForm(). The intermediate functions PopulateForm() and > CreateResolutionOptions() however take that parameter as an > (EFI_HII_HANDLE*). > > There is no bug in practice (because the affected functions never try to > de-reference the "PackageList" parameter, they just pass it on), but the > function prototypes are semantically wrong. Fix that. > > This could remain hidden so long because pointer-to-VOID silently converts > to/from any pointer-to-object type, and the UEFI spec mandates that > EFI_HII_HANDLE be a typedef to (VOID*). > > Cc: Ard Biesheuvel > Cc: Jordan Justen > Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel > --- > > Notes: > tested in UiApp > > OvmfPkg/PlatformDxe/Platform.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/OvmfPkg/PlatformDxe/Platform.c b/OvmfPkg/PlatformDxe/Platform.c > index 09181769babf..23ad43901f66 100644 > --- a/OvmfPkg/PlatformDxe/Platform.c > +++ b/OvmfPkg/PlatformDxe/Platform.c > @@ -486,7 +486,7 @@ STATIC > EFI_STATUS > EFIAPI > CreateResolutionOptions ( > - IN EFI_HII_HANDLE *PackageList, > + IN EFI_HII_HANDLE PackageList, > OUT VOID **OpCodeBuffer, > IN UINTN NumGopModes, > IN GOP_MODE *GopModes > @@ -547,7 +547,7 @@ STATIC > EFI_STATUS > EFIAPI > PopulateForm ( > - IN EFI_HII_HANDLE *PackageList, > + IN EFI_HII_HANDLE PackageList, > IN EFI_GUID *FormSetGuid, > IN EFI_FORM_ID FormId, > IN UINTN NumGopModes, > -- > 2.19.1.3.g30247aa5d201 > >