diff options
| author | James Morris <james.l.morris@oracle.com> | 2017-02-10 10:28:49 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-02-10 10:28:49 +1100 |
| commit | a2a15479d617ebbab67c60b4eed02524536af780 (patch) | |
| tree | 64c4a5bbf434b003f02f56edda845e89fd539a7a /security/apparmor | |
| parent | e2241be62deabe09d7c681326fcb0bc707082147 (diff) | |
| parent | 1ea0ce40690dff38935538e8dab7b12683ded0d3 (diff) | |
| download | linux-a2a15479d617ebbab67c60b4eed02524536af780.tar.bz2 | |
Merge branch 'stable-4.11' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'security/apparmor')
| -rw-r--r-- | security/apparmor/lsm.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index b63d39ca6278..709eacd23909 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c @@ -505,8 +505,8 @@ static int apparmor_getprocattr(struct task_struct *task, char *name, return error; } -static int apparmor_setprocattr(struct task_struct *task, char *name, - void *value, size_t size) +static int apparmor_setprocattr(const char *name, void *value, + size_t size) { char *command, *largs = NULL, *args = value; size_t arg_size; @@ -515,9 +515,6 @@ static int apparmor_setprocattr(struct task_struct *task, char *name, if (size == 0) return -EINVAL; - /* task can only write its own attributes */ - if (current != task) - return -EACCES; /* AppArmor requires that the buffer must be null terminated atm */ if (args[size - 1] != '\0') { |