From: "Chao Li" <lichao@loongson.cn>
To: devel@edk2.groups.io, heinrich.schuchardt@canonical.com
Cc: G Edhaya Chandran <Edhaya.Chandran@arm.com>,
Barton Gao <gaojie@byosoft.com.cn>,
Carolyn Gjertsen <Carolyn.Gjertsen@amd.com>
Subject: Re: [edk2-devel] [PATCH v1] SctPkg: Fixed a pinter error in DevicePathFromTextBBTestCoverage.c
Date: Tue, 27 Feb 2024 09:15:39 +0800 [thread overview]
Message-ID: <b4071785-f660-43cd-9cf9-06add0bc0fde@loongson.cn> (raw)
In-Reply-To: <e6e1432f-67bc-4d2a-a628-f9e5327d8a02@canonical.com>
[-- Attachment #1: Type: text/plain, Size: 3625 bytes --]
Hi Heinrich,
Thanks,
Chao
On 2024/2/26 19:02, Heinrich Schuchardt wrote:
> On 26.02.24 11:17, Chao Li wrote:
>> DevicePathFromTextBBTextCoverage.c function CreateDNSDeviceNode has a
>> bug, code:
>>
>> SctStrToIPv4Addr (&IpStr1, (EFI_IPv4_ADDRESS *)(DNS + sizeof
>> (DNS_DEVICE_PATH)));
>>
>> DNS is a pointer, which is increased by a structure size and converted
>> to EFI_IPv4_ADDRESS*, which will point to an unknown address. So fix it.
>
> Hello Chao,
>
> thanks for diving into this.
>
> Please, add
>
> Fixes: 847e0363e846 ("SctPkg: Fix the UefiSct
> -Wincompatible-pointer-types warnings")
>
>>
>> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4712
>>
>> Cc: G Edhaya Chandran <Edhaya.Chandran@...>
>> Cc: Barton Gao <gaojie@...>
>> Cc: Carolyn Gjertsen <Carolyn.Gjertsen@...>
>> Signed-off-by: Chao Li <lichao@...>
>> ---
>> .../BlackBoxTest/DevicePathFromTextBBTestCoverage.c | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git
>> a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestCoverage.c
>> b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestCoverage.c
>>
>> index c96ee246..bd11c25a 100644
>> ---
>> a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestCoverage.c
>> +++
>> b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestCoverage.c
>> @@ -1734,13 +1734,13 @@ CreateDNSDeviceNode (
>> }
>>
>> if (DNS->IsIPv6 == 0) {
>> - SctStrToIPv4Addr (&IpStr1, (EFI_IPv4_ADDRESS *)(DNS + sizeof
>> (DNS_DEVICE_PATH)));
>> - SctStrToIPv4Addr (&IpStr2, (EFI_IPv4_ADDRESS *)(DNS + sizeof
>> (DNS_DEVICE_PATH) + sizeof(EFI_IP_ADDRESS)));
>> + SctStrToIPv4Addr (&IpStr1, (EFI_IPv4_ADDRESS *)((UINT8 *)DNS +
>> sizeof (DNS_DEVICE_PATH)));
>> + SctStrToIPv4Addr (&IpStr2, (EFI_IPv4_ADDRESS *)((UINT8 *)DNS +
>> sizeof (DNS_DEVICE_PATH) + sizeof(EFI_IP_ADDRESS)));
>> }
>>
>> if (DNS->IsIPv6 == 1) {
>> - SctStrToIPv6Addr (&IpStr1, (EFI_IPv6_ADDRESS *)(DNS + sizeof
>> (DNS_DEVICE_PATH)));
>> - SctStrToIPv6Addr (&IpStr2, (EFI_IPv6_ADDRESS *)(DNS + sizeof
>> (DNS_DEVICE_PATH) + sizeof(EFI_IP_ADDRESS)));
>> + SctStrToIPv6Addr (&IpStr1, (EFI_IPv6_ADDRESS *)((UINT8 *)DNS +
>> sizeof (DNS_DEVICE_PATH)));
>> + SctStrToIPv6Addr (&IpStr2, (EFI_IPv6_ADDRESS *)((UINT8 *)DNS +
>> sizeof (DNS_DEVICE_PATH) + sizeof(EFI_IP_ADDRESS)));
>
> The change looks correct.
>
> I would prefer using the fields of the DNS_DEVICE_PATH typedef from
> MdePkg/Include/Protocol/DevicePath.h to avoid the conversions:
>
> > + SctStrToIPv4Addr (&IpStr1, &DNS->DnsServerIp[0].v4)
> > + SctStrToIPv4Addr (&IpStr2, &DNS->DnsServerIp[1].v4)
>
> > + SctStrToIPv6Addr (&IpStr1, &DNS->DnsServerIp[0].v6)
> > + SctStrToIPv6Addr (&IpStr2, &DNS->DnsServerIp[1].v6)
I also prefer this way, but the definition of DNS in
UEFI/Protocol/DevicePath.h is not same as the MdePkg version, should we
make them the same?
>
> Best regards
>
> Heinrich
>
>> }
>>
>> return (EFI_DEVICE_PATH_PROTOCOL *) DNS;
>> --
>> 2.27.0
>
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#115995): https://edk2.groups.io/g/devel/message/115995
Mute This Topic: https://groups.io/mt/104579419/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
[-- Attachment #2: Type: text/html, Size: 6471 bytes --]
next prev parent reply other threads:[~2024-02-27 1:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20240226101752.247067-1-lichao@...>
2024-02-26 11:02 ` [edk2-devel] [PATCH v1] SctPkg: Fixed a pinter error in DevicePathFromTextBBTestCoverage.c Heinrich Schuchardt
2024-02-27 1:15 ` Chao Li [this message]
[not found] ` <17B7934ED7B1BC99.684@groups.io>
2024-02-27 6:34 ` Chao Li
2024-02-26 10:17 Chao Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b4071785-f660-43cd-9cf9-06add0bc0fde@loongson.cn \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox