diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 15:25:23 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 15:25:23 +1000 |
commit | 655904fe42e83f2bb87c2b2c92baa2db400e7817 (patch) | |
tree | 9e34a9aafaeaaa964c42e007412c5f59fb60e62b /security/security.c | |
parent | 073846bac64b221563637fd5087eaad0172e79ee (diff) | |
parent | bdaaafd308ef1ecee0adb6e914ac8b1bb9464315 (diff) |
Merge commit 'selinux/for-akpm'
Diffstat (limited to 'security/security.c')
-rw-r--r-- | security/security.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/security/security.c b/security/security.c index 59838a99b80e..2c0a5876b939 100644 --- a/security/security.c +++ b/security/security.c @@ -161,9 +161,10 @@ int mod_reg_security(const char *name, struct security_operations *ops) /* Security operations */ -int security_ptrace(struct task_struct *parent, struct task_struct *child) +int security_ptrace(struct task_struct *parent, struct task_struct *child, + unsigned int mode) { - return security_ops->ptrace(parent, child); + return security_ops->ptrace(parent, child, mode); } int security_capget(struct task_struct *target, @@ -894,7 +895,7 @@ EXPORT_SYMBOL(security_secctx_to_secid); void security_release_secctx(char *secdata, u32 seclen) { - return security_ops->release_secctx(secdata, seclen); + security_ops->release_secctx(secdata, seclen); } EXPORT_SYMBOL(security_release_secctx); @@ -1011,12 +1012,12 @@ int security_sk_alloc(struct sock *sk, int family, gfp_t priority) void security_sk_free(struct sock *sk) { - return security_ops->sk_free_security(sk); + security_ops->sk_free_security(sk); } void security_sk_clone(const struct sock *sk, struct sock *newsk) { - return security_ops->sk_clone_security(sk, newsk); + security_ops->sk_clone_security(sk, newsk); } void security_sk_classify_flow(struct sock *sk, struct flowi *fl) |