linux-kernel - linux-next: manual merge of the sysctl tree 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: <20120215132543.27189492ab5e910a0899be85@canb.auug.org.au>
Date:	Wed, 15 Feb 2012 13:25:43 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Eric W. Biederman" <ebiederm@...ssion.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Al Viro <viro@....linux.org.uk>,
	James Morris <jmorris@...ei.org>
Subject: linux-next: manual merge of the sysctl tree with the security tree

Hi Eric,

Today's linux-next merge of the sysctl tree got a conflict in
fs/proc/proc_sysctl.c between commit 404015308747 ("security: trim
security.h") from the security tree and commit 1f87f0b52b1d ("sysctl:
Move the implementation into fs/proc/proc_sysctl.c") from the sysctl tree.

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

BTW, I think this file only needs to include <linux/export.h> not
module.h ...
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc fs/proc/proc_sysctl.c
index 67bbf6e,a7708b7..0000000
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@@ -6,9 -6,8 +6,10 @@@
  #include <linux/poll.h>
  #include <linux/proc_fs.h>
  #include <linux/security.h>
 +#include <linux/sched.h>
  #include <linux/namei.h>
 +#include <linux/mm.h>
+ #include <linux/module.h>
  #include "internal.h"
  
  static const struct dentry_operations proc_sys_dentry_operations;
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped