diff options
| author | Eric Paris <eparis@redhat.com> | 2009-08-07 14:53:57 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-08-10 11:00:39 +1000 |
| commit | 47d439e9fb8a81a90022cfa785bf1c36c4e2aff6 (patch) | |
| tree | 812ddfa575a58d8db06a3a91aab9bed8dce96420 /include | |
| parent | a2551df7ec568d87793d2eea4ca744e86318f205 (diff) | |
| download | linux-3.10-47d439e9fb8a81a90022cfa785bf1c36c4e2aff6.tar.gz linux-3.10-47d439e9fb8a81a90022cfa785bf1c36c4e2aff6.tar.bz2 linux-3.10-47d439e9fb8a81a90022cfa785bf1c36c4e2aff6.zip | |
security: define round_hint_to_min in !CONFIG_SECURITY
Fix the header files to define round_hint_to_min() and to define
mmap_min_addr_handler() in the !CONFIG_SECURITY case.
Built and tested with !CONFIG_SECURITY
Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/security.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 7b431155e39..57ead99d259 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -121,6 +121,21 @@ struct request_sock; #define LSM_UNSAFE_PTRACE 2 #define LSM_UNSAFE_PTRACE_CAP 4 +/* + * If a hint addr is less than mmap_min_addr change hint to be as + * low as possible but still greater than mmap_min_addr + */ +static inline unsigned long round_hint_to_min(unsigned long hint) +{ + hint &= PAGE_MASK; + if (((void *)hint != NULL) && + (hint < mmap_min_addr)) + return PAGE_ALIGN(mmap_min_addr); + return hint; +} +extern int mmap_min_addr_handler(struct ctl_table *table, int write, struct file *filp, + void __user *buffer, size_t *lenp, loff_t *ppos); + #ifdef CONFIG_SECURITY struct security_mnt_opts { @@ -149,21 +164,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) opts->num_mnt_opts = 0; } -/* - * If a hint addr is less than mmap_min_addr change hint to be as - * low as possible but still greater than mmap_min_addr - */ -static inline unsigned long round_hint_to_min(unsigned long hint) -{ - hint &= PAGE_MASK; - if (((void *)hint != NULL) && - (hint < mmap_min_addr)) - return PAGE_ALIGN(mmap_min_addr); - return hint; -} - -extern int mmap_min_addr_handler(struct ctl_table *table, int write, struct file *filp, - void __user *buffer, size_t *lenp, loff_t *ppos); /** * struct security_operations - main security structure * |