linux-kernel - Re: [PATCH 5.2 083/215] net/ipv4: fib_trie: Avoid cryptic ternary expressions

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 for Android: free password hash cracker in your pocket

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

Date:   Tue, 30 Jul 2019 13:59:30 -0400
From:   Sasha Levin <sashal@...nel.org>
To:     Nick Desaulniers <ndesaulniers@...gle.com>
Cc:     Matthias Kaehlcke <mka@...omium.org>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        LKML <linux-kernel@...r.kernel.org>,
        "# 3.4.x" <stable@...r.kernel.org>,
        Douglas Anderson <dianders@...omium.org>,
        Alexander Duyck <alexander.h.duyck@...ux.intel.com>,
        "David S. Miller" <davem@...emloft.net>,
        Toralf Förster <toralf.foerster@....de>,
        Nathan Huckleberry <nhuck@...gle.com>
Subject: Re: [PATCH 5.2 083/215] net/ipv4: fib_trie: Avoid cryptic ternary
 expressions

On Mon, Jul 29, 2019 at 02:01:08PM -0700, Nick Desaulniers wrote:
>On Mon, Jul 29, 2019 at 1:57 PM Matthias Kaehlcke <mka@...omium.org> wrote:
>>
>> On Mon, Jul 29, 2019 at 01:54:22PM -0700, Matthias Kaehlcke wrote:
>> > Hi Greg,
>> >
>> > Toralf just pointed out in another thread that the commit message and
>> > the content of this patch don't match (https://lkml.org/lkml/2019/7/29/1475)
>> >
>> > I did some minor digging, the content of the queued patch is:
>> >
>> > commit 4df607cc6fe8e46b258ff2a53d0a60ca3008ffc7
>> > Author: Nathan Huckleberry <nhuck@...gle.com>
>> > Date:   Mon Jun 17 10:28:29 2019 -0700
>> >
>> >     kbuild: Remove unnecessary -Wno-unused-value
>> >
>> >
>> > however the commit message is from:
>> >
>> > commit 25cec756891e8733433efea63b2254ddc93aa5cc
>> > Author: Matthias Kaehlcke <mka@...omium.org>
>> > Date:   Tue Jun 18 14:14:40 2019 -0700
>> >
>> >     net/ipv4: fib_trie: Avoid cryptic ternary expressions
>> >
>> >
>> > It seems this hasn't been commited to -stable yet, so we are probably
>> > in time to remove it from the queue before it becomes git history and
>> > have Nathan re-spin the patch(es).
>>
>> s/Nathan/Sasha/
>>
>> For some reason I thought Nathan backported this and wondered that his
>> SOB is missing. The correct SOB is actually there.
>
>I don't think Nathan explicitly tried to backport anything.  This
>looks to me like AUTOSEL maybe took a commit message from a different
>commit, and applied it to this diff.
>
>ie. I don't think this is a bug in a manual backport, I think AUTOSEL
>did something funny and created a backport with commit message A but
>commit diff B.

Thanks for reporting this! It is indeed a bug with my scripts.

The story here is that we have commit A which references commit B, but
commit B ended up getting merged before commit A, which confused my
scripts. I'll go fix up the stable tree and my scripts.

--
Thanks,
Sasha