projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
serial: 8250_ingenic: Enable FIFO for Ingenic UARTs
[cascardo/linux.git]
/
security
/
security.c
diff --git
a/security/security.c
b/security/security.c
index
9942836
..
46f405c
100644
(file)
--- a/
security/security.c
+++ b/
security/security.c
@@
-56,18
+56,13
@@
int __init security_init(void)
pr_info("Security Framework initialized\n");
/*
pr_info("Security Framework initialized\n");
/*
- *
Always load the capability module
.
+ *
Load minor LSMs, with the capability module always first
.
*/
capability_add_hooks();
*/
capability_add_hooks();
-#ifdef CONFIG_SECURITY_YAMA_STACKED
- /*
- * If Yama is configured for stacking load it next.
- */
yama_add_hooks();
yama_add_hooks();
-#endif
+
/*
/*
- * Load the chosen module if there is one.
- * This will also find yama if it is stacking
+ * Load all the remaining security modules.
*/
do_security_initcalls();
*/
do_security_initcalls();
@@
-776,7
+771,7
@@
static inline unsigned long mmap_prot(struct file *file, unsigned long prot)
* ditto if it's not on noexec mount, except that on !MMU we need
* NOMMU_MAP_EXEC (== VM_MAYEXEC) in this case
*/
* ditto if it's not on noexec mount, except that on !MMU we need
* NOMMU_MAP_EXEC (== VM_MAYEXEC) in this case
*/
- if (!
(file->f_path.mnt->mnt_flags & MNT_NOEXEC
)) {
+ if (!
path_noexec(&file->f_path
)) {
#ifndef CONFIG_MMU
if (file->f_op->mmap_capabilities) {
unsigned caps = file->f_op->mmap_capabilities(file);
#ifndef CONFIG_MMU
if (file->f_op->mmap_capabilities) {
unsigned caps = file->f_op->mmap_capabilities(file);