linux-kernel - Re: mmotm 2020-01-28-20-05 uploaded (security/security.c)

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: <30511826-765f-6b10-7bad-b950b3941295@infradead.org>
Date:   Wed, 29 Jan 2020 08:02:57 -0800
From:   Randy Dunlap <rdunlap@...radead.org>
To:     Paul Moore <paul@...l-moore.com>
Cc:     akpm@...ux-foundation.org, broonie@...nel.org,
        linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org,
        linux-mm@...ck.org, linux-next@...r.kernel.org, mhocko@...e.cz,
        mm-commits@...r.kernel.org, sfr@...b.auug.org.au,
        linux-security-module <linux-security-module@...r.kernel.org>,
        James Morris <jmorris@...ei.org>,
        "Serge E. Hallyn" <serge@...lyn.com>
Subject: Re: mmotm 2020-01-28-20-05 uploaded (security/security.c)

On 1/29/20 5:51 AM, Paul Moore wrote:
> On Tue, Jan 28, 2020 at 11:52 PM Randy Dunlap <rdunlap@...radead.org> wrote:
>> On 1/28/20 8:06 PM, akpm@...ux-foundation.org wrote:
>>> The mm-of-the-moment snapshot 2020-01-28-20-05 has been uploaded to
>>>
>>>    http://www.ozlabs.org/~akpm/mmotm/
>>>
>>> mmotm-readme.txt says
>>>
>>> README for mm-of-the-moment:
>>>
>>> http://www.ozlabs.org/~akpm/mmotm/
>>>
>>> This is a snapshot of my -mm patch queue.  Uploaded at random hopefully
>>> more than once a week.
>>>
>>
>> security/security.c contains duplicate lines for <lockdown_reasons> array:
> 
> Hmmm.  Commit 59438b46471a ("security,lockdown,selinux: implement
> SELinux lockdown"), which was merged into Linus' tree during the
> current merge window, moved the lockdown_reasons array from
> security/lockdown/lockdown.c to security/security.c; is there another
> tree in linux-next which is moving lockdown_reasons into
> security/security.c?
> 

Somehow in mmotm those lines of code were merged 2x:
once from origin.patch and once from linux-next.patch.

Looks more like a mmotm merge issue, not a security/ issue.

-- 
~Randy