netdev - Re: [PATCH ethtool 1/3] misc: Fix build with kernel headers

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]

Date:   Fri, 13 Jan 2023 18:07:40 -0800
From:   Florian Fainelli <f.fainelli@...il.com>
To:     Michal Kubecek <mkubecek@...e.cz>
Cc:     netdev@...r.kernel.org, Markus Mayer <mmayer@...adcom.com>,
        Andrew Lunn <andrew@...n.ch>
Subject: Re: [PATCH ethtool 1/3] misc: Fix build with kernel headers < v4.11



On 1/13/2023 4:11 PM, Florian Fainelli wrote:
> 
> 
> On 1/13/2023 3:57 PM, Michal Kubecek wrote:
>> On Fri, Jan 13, 2023 at 03:31:46PM -0800, Florian Fainelli wrote:
>>> Not all toolchain kernel headers may contain upstream commit
>>> 2618be7dccf8739b89e1906b64bd8d551af351e6 ("uapi: fix linux/if.h
>>> userspace compilation errors") which is included in v4.11 and onwards.
>>> Err on the side of caution by including sys/socket.h ahead of including
>>> linux/if.h.
>>>
>>> Fixes: 1fa60003a8b8 ("misc: header includes cleanup")
>>> Reported-by: Markus Mayer <mmayer@...adcom.com>
>>> Signed-off-by: Florian Fainelli <f.fainelli@...il.com>
>>> ---
>>>   internal.h | 1 +
>>>   1 file changed, 1 insertion(+)
>>>
>>> diff --git a/internal.h b/internal.h
>>> index b80f77afa4c0..f7aaaf5229f4 100644
>>> --- a/internal.h
>>> +++ b/internal.h
>>> @@ -21,6 +21,7 @@
>>>   #include <unistd.h>
>>>   #include <endian.h>
>>>   #include <sys/ioctl.h>
>>> +#include <sys/socket.h>
>>>   #include <linux/if.h>
>>>   #include "json_writer.h"
>>
>> No objection but I wonder if it wouldn't make sense to add linux/if.h to
>> the header copies in uapi/ instead as then we could also drop the
>> fallback definition of ALTIFNAMSIZ and perhaps more similar hacks.
> 
> Humm, I wondered about that but it seems like opening a possible can of 
> worms as the history of include/uapi/linux/if.h changed across multiple 
> versions. As long as it does compile, why not :)

Just to be clear, I will give that one a shot and let you know how it 
goes, if it works fine, then it will be in v2.
-- 
Florian