linux-kernel - linux-next: manual merge of the pidfd tree with the integrity tree

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

Message-ID: <20210125173120.28b94105@canb.auug.org.au>
Date:   Mon, 25 Jan 2021 17:31:20 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Christian Brauner <christian@...uner.io>
Cc:     Christian Brauner <christian.brauner@...ntu.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Mimi Zohar <zohar@...ux.ibm.com>,
        Tushar Sugandhi <tusharsu@...ux.microsoft.com>
Subject: linux-next: manual merge of the pidfd tree with the integrity tree

Hi all,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

Today's linux-next merge of the pidfd tree got a conflict in:

  security/integrity/ima/ima_main.c

between commits:

  2b4a2474a202 ("IMA: generalize keyring specific measurement constructs")
  291af651b350 ("IMA: add support to measure buffer data hash")
  d6e645012d97 ("IMA: define a hook to measure kernel integrity critical data")
  9f5d7d23cc5e ("IMA: extend critical data hook to limit the measurement based on a label")

from the integrity tree and commit:

  a2d2329e30e2 ("ima: handle idmapped mounts")

from the pidfd tree.

At this point, the whole thing just got too hard, so I dropped the
pidfd tree for today.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped