diff options
author | John Johansen <john.johansen@canonical.com> | 2013-02-18 19:06:34 -0500 |
---|---|---|
committer | John Johansen <john.johansen@canonical.com> | 2013-04-28 03:36:32 -0400 |
commit | 4b7c331fc2eceaa4da5ded41c0b2eca3fd924444 (patch) | |
tree | 32ee416a4529f887a600704716166fc31f5efd63 /security | |
parent | 7a2871b566f34d980556072943295efd107eb53c (diff) |
apparmor: remove "permipc" command
The "permipc" command is unused and unfinished, remove it.
Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Kees Cook <kees@ubuntu.com>
Diffstat (limited to 'security')
-rw-r--r-- | security/apparmor/include/procattr.h | 1 | ||||
-rw-r--r-- | security/apparmor/lsm.c | 2 | ||||
-rw-r--r-- | security/apparmor/procattr.c | 6 |
3 files changed, 0 insertions, 9 deletions
diff --git a/security/apparmor/include/procattr.h b/security/apparmor/include/procattr.h index 544aa6b766a4..6bd5f33d9533 100644 --- a/security/apparmor/include/procattr.h +++ b/security/apparmor/include/procattr.h | |||
@@ -21,6 +21,5 @@ | |||
21 | int aa_getprocattr(struct aa_profile *profile, char **string); | 21 | int aa_getprocattr(struct aa_profile *profile, char **string); |
22 | int aa_setprocattr_changehat(char *args, size_t size, int test); | 22 | int aa_setprocattr_changehat(char *args, size_t size, int test); |
23 | int aa_setprocattr_changeprofile(char *fqname, bool onexec, int test); | 23 | int aa_setprocattr_changeprofile(char *fqname, bool onexec, int test); |
24 | int aa_setprocattr_permipc(char *fqname); | ||
25 | 24 | ||
26 | #endif /* __AA_PROCATTR_H */ | 25 | #endif /* __AA_PROCATTR_H */ |
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index 0f61dadca9e6..ed7e3aadba3a 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c | |||
@@ -572,8 +572,6 @@ static int apparmor_setprocattr(struct task_struct *task, char *name, | |||
572 | } else if (strcmp(command, "permprofile") == 0) { | 572 | } else if (strcmp(command, "permprofile") == 0) { |
573 | error = aa_setprocattr_changeprofile(args, !AA_ONEXEC, | 573 | error = aa_setprocattr_changeprofile(args, !AA_ONEXEC, |
574 | AA_DO_TEST); | 574 | AA_DO_TEST); |
575 | } else if (strcmp(command, "permipc") == 0) { | ||
576 | error = aa_setprocattr_permipc(args); | ||
577 | } else { | 575 | } else { |
578 | struct common_audit_data sa; | 576 | struct common_audit_data sa; |
579 | struct apparmor_audit_data aad = {0,}; | 577 | struct apparmor_audit_data aad = {0,}; |
diff --git a/security/apparmor/procattr.c b/security/apparmor/procattr.c index 1b41c542d376..6c9390179b89 100644 --- a/security/apparmor/procattr.c +++ b/security/apparmor/procattr.c | |||
@@ -163,9 +163,3 @@ int aa_setprocattr_changeprofile(char *fqname, bool onexec, int test) | |||
163 | name = aa_split_fqname(fqname, &ns_name); | 163 | name = aa_split_fqname(fqname, &ns_name); |
164 | return aa_change_profile(ns_name, name, onexec, test); | 164 | return aa_change_profile(ns_name, name, onexec, test); |
165 | } | 165 | } |
166 | |||
167 | int aa_setprocattr_permipc(char *fqname) | ||
168 | { | ||
169 | /* TODO: add ipc permission querying */ | ||
170 | return -ENOTSUPP; | ||
171 | } | ||