linux-kernel - Re: [PATCH] tools: Fixed MIPS builds due to struct flock re-definition

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAK8P3a1LnCz32DixQ2VuBh+c64+CNqNJ8v2Nk0X6P8kYA4=-gQ@mail.gmail.com>
Date:   Tue, 19 Jul 2022 23:15:38 +0200
From:   Arnd Bergmann <arnd@...db.de>
To:     Florian Fainelli <f.fainelli@...il.com>
Cc:     Arnd Bergmann <arnd@...db.de>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Christoph Hellwig <hch@....de>,
        Nathan Chancellor <nathan@...nel.org>,
        Naresh Kamboju <naresh.kamboju@...aro.org>,
        "open list:BROADCOM NVRAM DRIVER" <linux-mips@...r.kernel.org>,
        linux-arch <linux-arch@...r.kernel.org>,
        Heiko Stuebner <heiko@...ech.de>,
        Palmer Dabbelt <palmer@...osinc.com>,
        Guo Ren <guoren@...nel.org>
Subject: Re: [PATCH] tools: Fixed MIPS builds due to struct flock re-definition

On Tue, Jul 19, 2022 at 9:05 PM Florian Fainelli <f.fainelli@...il.com> wrote:
> On 7/19/2022 12:42 AM, Arnd Bergmann wrote:

> > I applied this to the asm-generic tree, but now I'm having second thoughts, as
> > this only changes the tools/include/ version but not the version we ship to user
> > space. Normally these are meant to be kept in sync.
>
> Thanks! Just to be clear, applying just your patch is not enough as the
> original build issue is still present, so we would need my change plus
> yours, I think that is what you intended but just wanted to double
> confirm.

Yes, this was just the diff on top of your patch, I've folded it into a single
commit now.

> On a side note your tree at:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git/refs/heads
>
> does not appear to have it included/pushed out yet, should I be looking
> at another git tree?

Pushed it out now. There is the main asm-generic branch that is in
linux-next, and the asm-generic-fixes branch that I should send after
the build bots report success.

I've merged the fixes branch into the main branch for testing for the
moment, but will undo the merge when I forward the contents.

> > It appears that commit 306f7cc1e906 ("uapi: always define
> > F_GETLK64/F_SETLK64/F_SETLKW64 in fcntl.h") already caused
> > them to diverge, presumably the uapi version here is correct and we
> > forgot to adapt the tools version at some point. There are also some
> > non-functional differences from older patches.
> >
> > I think the correct fix to address the problem in both versions and
> > get them back into sync would be something like the patch below.
> > I have done zero testing on it though.
> >
> > Christoph and Florian, any other suggestions?
>
> This works for me with my patch plus your patch in the following
> configurations:
>
> - MIPS toolchain with kernel-headers 4.1.x
> - MIPS toolchain with kernel headers using my patch plus your patch
>
> Tested-by: Florian Fainelli <f.fainelli@...il.com>

Thanks!

       Arnd