diff options
Diffstat (limited to 'security/security.c')
-rw-r--r-- | security/security.c | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/security/security.c b/security/security.c index a55d739c6864..dc5babb2d6d8 100644 --- a/security/security.c +++ b/security/security.c | |||
@@ -213,34 +213,24 @@ int security_vm_enough_memory_kern(long pages) | |||
213 | return security_ops->vm_enough_memory(current->mm, pages); | 213 | return security_ops->vm_enough_memory(current->mm, pages); |
214 | } | 214 | } |
215 | 215 | ||
216 | int security_bprm_alloc(struct linux_binprm *bprm) | 216 | int security_bprm_set_creds(struct linux_binprm *bprm) |
217 | { | 217 | { |
218 | return security_ops->bprm_alloc_security(bprm); | 218 | return security_ops->bprm_set_creds(bprm); |
219 | } | 219 | } |
220 | 220 | ||
221 | void security_bprm_free(struct linux_binprm *bprm) | 221 | int security_bprm_check(struct linux_binprm *bprm) |
222 | { | ||
223 | security_ops->bprm_free_security(bprm); | ||
224 | } | ||
225 | |||
226 | int security_bprm_apply_creds(struct linux_binprm *bprm, int unsafe) | ||
227 | { | ||
228 | return security_ops->bprm_apply_creds(bprm, unsafe); | ||
229 | } | ||
230 | |||
231 | void security_bprm_post_apply_creds(struct linux_binprm *bprm) | ||
232 | { | 222 | { |
233 | security_ops->bprm_post_apply_creds(bprm); | 223 | return security_ops->bprm_check_security(bprm); |
234 | } | 224 | } |
235 | 225 | ||
236 | int security_bprm_set(struct linux_binprm *bprm) | 226 | void security_bprm_committing_creds(struct linux_binprm *bprm) |
237 | { | 227 | { |
238 | return security_ops->bprm_set_security(bprm); | 228 | return security_ops->bprm_committing_creds(bprm); |
239 | } | 229 | } |
240 | 230 | ||
241 | int security_bprm_check(struct linux_binprm *bprm) | 231 | void security_bprm_committed_creds(struct linux_binprm *bprm) |
242 | { | 232 | { |
243 | return security_ops->bprm_check_security(bprm); | 233 | return security_ops->bprm_committed_creds(bprm); |
244 | } | 234 | } |
245 | 235 | ||
246 | int security_bprm_secureexec(struct linux_binprm *bprm) | 236 | int security_bprm_secureexec(struct linux_binprm *bprm) |