netdev - Re: [net] selftests: txtimestamp: fix compilation issue

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <6d6e929a-052c-04ff-2b97-084970c357b2@novek.ru>
Date:   Thu, 4 Feb 2021 15:10:14 +0000
From:   Vadim Fedorenko <vfedorenko@...ek.ru>
To:     Willem de Bruijn <willemdebruijn.kernel@...il.com>
Cc:     Jakub Kicinski <kuba@...nel.org>, Jian Yang <jianyang@...gle.com>,
        Network Development <netdev@...r.kernel.org>
Subject: Re: [net] selftests: txtimestamp: fix compilation issue

On 04.02.2021 13:34, Willem de Bruijn wrote:
> On Wed, Feb 3, 2021 at 4:11 PM Vadim Fedorenko <vfedorenko@...ek.ru> wrote:
>>
>> PACKET_TX_TIMESTAMP is defined in if_packet.h but it is not included in
>> test. But we cannot include it because we have definitions of struct and
>> including leads to redefinition error. So define PACKET_TX_TIMESTAMP too.
> 
> The conflicts are with <netpacket/packet.h>. I think it will build if
> you remove that.

Good point. I will try to replace the includes.

>> Fixes: 5ef5c90e3cb3 (selftests: move timestamping selftests to net folder)
> 
> This commit only moved the file. The file was moved twice. Even though
> it cannot really be applied easily before the move, this goes back to
> commit 8fe2f761cae9 ("net-timestamp: expand documentation").
Yeah, you are right. Didn't go so deep.

>> Signed-off-by: Vadim Fedorenko <vfedorenko@...ek.ru>
> 
> Do you also get the compiler warning about ambiguous control flow?
> 
>    tools/testing/selftests/net/txtimestamp.c:498:6: warning: suggest
> explicit braces to avoid ambiguous ‘else’ [-Wdangling-else]
> 
> When touching this file, might be good to also fix that up:
> 
> -               if (cfg_use_pf_packet || cfg_ipproto == IPPROTO_RAW)
> +               if (cfg_use_pf_packet || cfg_ipproto == IPPROTO_RAW) {
>                          if (family == PF_INET)
>                                  total_len += sizeof(struct iphdr);
>                          else
>                                  total_len += sizeof(struct ipv6hdr);
> +               }
> 

Yes, but skipped it because the main goal was to fix selftests/net build in 
general and forgot about it later. I will address this warning too.

Thanks Willem!