linux-kernel - linux-next: manual merge of the akpm with the security 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: <20120210165055.b12ec02e86249d32bc96af14@canb.auug.org.au>
Date:	Fri, 10 Feb 2012 16:50:55 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kees Cook <keescook@...omium.org>,
	John Johansen <john.johansen@...onical.com>,
	James Morris <jmorris@...ei.org>,
	Lennart Poettering <lennart@...ttering.net>
Subject: linux-next: manual merge of the akpm with the security tree

Hi Andrew,

Today's linux-next merge of the scsi-post-merge tree got a conflict in
include/linux/prctl.h between commit 2d514487faf1 ("security: Yama LSM")
from the security tree and commit "prctl: add PR_{SET,GET}
_CHILD_SUBREAPER to allow simple process supervision" from the akpm tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc include/linux/prctl.h
index 4d0e5bc,b885c85..0000000
--- a/include/linux/prctl.h
+++ b/include/linux/prctl.h
@@@ -114,10 -114,7 +114,13 @@@
  # define PR_SET_MM_START_BRK		6
  # define PR_SET_MM_BRK			7
  
+ #define PR_SET_CHILD_SUBREAPER 35
+ #define PR_GET_CHILD_SUBREAPER 36
+ 
 +/*
 + * Set specific pid that is allowed to ptrace the current task.
 + * A value of 0 mean "no process".
 + */
 +#define PR_SET_PTRACER 0x59616d61
 +
  #endif /* _LINUX_PRCTL_H */

Content of type "application/pgp-signature" skipped