diff options
Diffstat (limited to 'include/linux/security.h')
-rw-r--r-- | include/linux/security.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index ac4bc3760b46..dc3472c1f781 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <linux/resource.h> | 28 | #include <linux/resource.h> |
29 | #include <linux/sem.h> | 29 | #include <linux/sem.h> |
30 | #include <linux/shm.h> | 30 | #include <linux/shm.h> |
31 | #include <linux/mm.h> /* PAGE_ALIGN */ | ||
31 | #include <linux/msg.h> | 32 | #include <linux/msg.h> |
32 | #include <linux/sched.h> | 33 | #include <linux/sched.h> |
33 | #include <linux/key.h> | 34 | #include <linux/key.h> |
@@ -95,6 +96,7 @@ extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb); | |||
95 | extern int cap_netlink_recv(struct sk_buff *skb, int cap); | 96 | extern int cap_netlink_recv(struct sk_buff *skb, int cap); |
96 | 97 | ||
97 | extern unsigned long mmap_min_addr; | 98 | extern unsigned long mmap_min_addr; |
99 | extern unsigned long dac_mmap_min_addr; | ||
98 | /* | 100 | /* |
99 | * Values used in the task_security_ops calls | 101 | * Values used in the task_security_ops calls |
100 | */ | 102 | */ |
@@ -147,6 +149,21 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) | |||
147 | opts->num_mnt_opts = 0; | 149 | opts->num_mnt_opts = 0; |
148 | } | 150 | } |
149 | 151 | ||
152 | /* | ||
153 | * If a hint addr is less than mmap_min_addr change hint to be as | ||
154 | * low as possible but still greater than mmap_min_addr | ||
155 | */ | ||
156 | static inline unsigned long round_hint_to_min(unsigned long hint) | ||
157 | { | ||
158 | hint &= PAGE_MASK; | ||
159 | if (((void *)hint != NULL) && | ||
160 | (hint < mmap_min_addr)) | ||
161 | return PAGE_ALIGN(mmap_min_addr); | ||
162 | return hint; | ||
163 | } | ||
164 | |||
165 | extern int mmap_min_addr_handler(struct ctl_table *table, int write, struct file *filp, | ||
166 | void __user *buffer, size_t *lenp, loff_t *ppos); | ||
150 | /** | 167 | /** |
151 | * struct security_operations - main security structure | 168 | * struct security_operations - main security structure |
152 | * | 169 | * |