diff options
Diffstat (limited to 'security/apparmor/include')
| -rw-r--r-- | security/apparmor/include/capability.h | 5 | ||||
| -rw-r--r-- | security/apparmor/include/ipc.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/security/apparmor/include/capability.h b/security/apparmor/include/capability.h index 2e7c9d6a2f3b..fc3fa381d850 100644 --- a/security/apparmor/include/capability.h +++ b/security/apparmor/include/capability.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * This file contains AppArmor capability mediation definitions. | 4 | * This file contains AppArmor capability mediation definitions. |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 1998-2008 Novell/SUSE | 6 | * Copyright (C) 1998-2008 Novell/SUSE |
| 7 | * Copyright 2009-2010 Canonical Ltd. | 7 | * Copyright 2009-2013 Canonical Ltd. |
| 8 | * | 8 | * |
| 9 | * This program is free software; you can redistribute it and/or | 9 | * This program is free software; you can redistribute it and/or |
| 10 | * modify it under the terms of the GNU General Public License as | 10 | * modify it under the terms of the GNU General Public License as |
| @@ -38,8 +38,7 @@ struct aa_caps { | |||
| 38 | 38 | ||
| 39 | extern struct aa_fs_entry aa_fs_entry_caps[]; | 39 | extern struct aa_fs_entry aa_fs_entry_caps[]; |
| 40 | 40 | ||
| 41 | int aa_capable(struct task_struct *task, struct aa_profile *profile, int cap, | 41 | int aa_capable(struct aa_profile *profile, int cap, int audit); |
| 42 | int audit); | ||
| 43 | 42 | ||
| 44 | static inline void aa_free_cap_rules(struct aa_caps *caps) | 43 | static inline void aa_free_cap_rules(struct aa_caps *caps) |
| 45 | { | 44 | { |
diff --git a/security/apparmor/include/ipc.h b/security/apparmor/include/ipc.h index aeda0fbc8b2f..288ca76e2fb1 100644 --- a/security/apparmor/include/ipc.h +++ b/security/apparmor/include/ipc.h | |||
| @@ -19,8 +19,8 @@ | |||
| 19 | 19 | ||
| 20 | struct aa_profile; | 20 | struct aa_profile; |
| 21 | 21 | ||
| 22 | int aa_may_ptrace(struct task_struct *tracer_task, struct aa_profile *tracer, | 22 | int aa_may_ptrace(struct aa_profile *tracer, struct aa_profile *tracee, |
| 23 | struct aa_profile *tracee, unsigned int mode); | 23 | unsigned int mode); |
| 24 | 24 | ||
| 25 | int aa_ptrace(struct task_struct *tracer, struct task_struct *tracee, | 25 | int aa_ptrace(struct task_struct *tracer, struct task_struct *tracee, |
| 26 | unsigned int mode); | 26 | unsigned int mode); |
