netdev - Re: uapi-header: doesn't update header include guard macros

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: <DC3E6ED5-513E-43F2-857A-95E489771D66@oracle.com>
Date: Tue, 3 Oct 2023 22:47:42 +0000
From: Chuck Lever III <chuck.lever@...cle.com>
To: Jakub Kicinski <kuba@...nel.org>
CC: "open list:NETWORKING [GENERAL]" <netdev@...r.kernel.org>
Subject: Re: uapi-header: doesn't update header include guard macros



> On Oct 3, 2023, at 5:48 PM, Jakub Kicinski <kuba@...nel.org> wrote:
> 
> On Tue, 3 Oct 2023 14:45:13 -0700 Jakub Kicinski wrote:
>> Fair point, perhaps we can do something like the patch below.
>> LMK if it's good enough.
>> 
>> We don't have any family of this nature in the networking tree.
>> Would you need this for 6.7 i.e. the next merge window already?
>> I can put it on top of an -rc tag when applying, so you can merge..
> 
> Sorry I had it half-committed, this should apply more cleanly:

fwiw -- Tested-by: Chuck Lever <chuck.lever@...cle.com <mailto:chuck.lever@...cle.com>>

I don't see any impending guard name conflicts, so merge this
whenever is convenient for you. Once this is committed, the
next time the nfsd spec changes, include/uapi/linux/nfsd_netlink.h
will get updated.


> ----->8---------
> 
> tools: ynl-gen: use uapi header name for the header guard
> 
> Chuck points out that we should use the uapi-header property
> when generating the guard. Otherwise we may generate the same
> guard as another file in the tree.
> 
> Signed-off-by: Jakub Kicinski <kuba@...nel.org>
> ---
> tools/net/ynl/ynl-gen-c.py | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/net/ynl/ynl-gen-c.py b/tools/net/ynl/ynl-gen-c.py
> index 897af958cee8..168fe612b029 100755
> --- a/tools/net/ynl/ynl-gen-c.py
> +++ b/tools/net/ynl/ynl-gen-c.py
> @@ -805,6 +805,10 @@ from lib import SpecFamily, SpecAttrSet, SpecAttr, SpecOperation, SpecEnumSet, S
>             self.uapi_header = self.yaml['uapi-header']
>         else:
>             self.uapi_header = f"linux/{self.name}.h"
> +        if self.uapi_header.startswith("linux/") and self.uapi_header.endswith('.h'):
> +            self.uapi_header_name = self.uapi_header[6:-2]
> +        else:
> +            self.uapi_header_name = self.name
> 
>     def resolve(self):
>         self.resolve_up(super())
> @@ -2124,7 +2128,7 @@ _C_KW = {
> 
> 
> def render_uapi(family, cw):
> -    hdr_prot = f"_UAPI_LINUX_{family.name.upper()}_H"
> +    hdr_prot = f"_UAPI_LINUX_{c_upper(family.uapi_header_name)}_H"
>     cw.p('#ifndef ' + hdr_prot)
>     cw.p('#define ' + hdr_prot)
>     cw.nl()
> -- 
> 2.41.0
> 
> 

--
Chuck Lever