Commit 3f03bf93 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security 

Pull general security subsystem updates from James Morris:
 "The main changes here are Paul Gortmaker's removal of unneccesary
  module.h infrastructure"

* 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  security: integrity: partial revert of make ima_main explicitly non-modular
  security: fs: make inode explicitly non-modular
  security: audit and remove any unnecessary uses of module.h
  security: integrity: make evm_main explicitly non-modular
  keys: remove needless modular infrastructure from ecryptfs_format
  security: integrity: make ima_main explicitly non-modular
  tomoyo: fix small typo
parents fb2a624d b49d5643

security/apparmor/apparmorfs.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/ctype.h>

#include <linux/security.h>

#include <linux/vmalloc.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/seq_file.h>

#include <linux/uaccess.h>

#include <linux/mount.h>

security/commoncap.c

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 


#include <linux/capability.h>

#include <linux/audit.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/lsm_hooks.h>

security/inode.c

+2 −4
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ 
 */



/* #define DEBUG */

#include <linux/module.h>

#include <linux/sysfs.h>

#include <linux/kobject.h>

#include <linux/fs.h>

#include <linux/mount.h>

#include <linux/pagemap.h>
@@ -341,7 +342,4 @@ static int __init securityfs_init(void) 
#endif

	return 0;

}



core_initcall(securityfs_init);
 
MODULE_LICENSE("GPL");

security/integrity/evm/evm_crypto.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/module.h>

#include <linux/export.h>

#include <linux/crypto.h>

#include <linux/xattr.h>

#include <linux/evm.h>

security/integrity/evm/evm_main.c

+1 −4
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/module.h>

#include <linux/init.h>

#include <linux/crypto.h>

#include <linux/audit.h>

#include <linux/xattr.h>
@@ -592,6 +592,3 @@ error: 
}



late_initcall(init_evm);
 


MODULE_DESCRIPTION("Extended Verification Module");

MODULE_LICENSE("GPL");

CRA Git | Maintained and supported by SUSTech CRA and CCSE