diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 10:48:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 10:48:34 -0800 |
| commit | 8ed5de58cf4c45ff0ca97cb0d48d76f0e42faec6 (patch) | |
| tree | ede6bc489b4d0cae91d730393d6c0dc654528b46 /security/security.c | |
| parent | 2dd550b90b03d5f236a18ae491bf6e70798469a8 (diff) | |
| parent | 394c6753978a75cab7558a377f2551a3c1101027 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
SELinux: Remove security_get_policycaps()
security: allow Kconfig to set default mmap_min_addr protection
Diffstat (limited to 'security/security.c')
| -rw-r--r-- | security/security.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/security.c b/security/security.c index b6c57a6b2ff..d15e56cbaad 100644 --- a/security/security.c +++ b/security/security.c @@ -23,7 +23,9 @@ extern struct security_operations dummy_security_ops; extern void security_fixup_ops(struct security_operations *ops); struct security_operations *security_ops; /* Initialized to NULL */ -unsigned long mmap_min_addr; /* 0 means no protection */ + +/* amount of vm to protect from userspace access */ +unsigned long mmap_min_addr = CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR; static inline int verify(struct security_operations *ops) { |