Commit 4b7c331f authored Feb 18, 2013 by John Johansen

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>

parent 7a2871b5

security/apparmor/include/procattr.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,5 @@
	int aa_getprocattr(struct aa_profile profile, char *string);		int aa_getprocattr(struct aa_profile profile, char *string);
	int aa_setprocattr_changehat(char *args, size_t size, int test);		int aa_setprocattr_changehat(char *args, size_t size, int test);
	int aa_setprocattr_changeprofile(char *fqname, bool onexec, int test);		int aa_setprocattr_changeprofile(char *fqname, bool onexec, int test);
	int aa_setprocattr_permipc(char *fqname);

	#endif /* __AA_PROCATTR_H */		#endif /* __AA_PROCATTR_H */

security/apparmor/lsm.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -572,8 +572,6 @@ static int apparmor_setprocattr(struct task_struct task, char name,
	} else if (strcmp(command, "permprofile") == 0) {		} else if (strcmp(command, "permprofile") == 0) {
	error = aa_setprocattr_changeprofile(args, !AA_ONEXEC,		error = aa_setprocattr_changeprofile(args, !AA_ONEXEC,
	AA_DO_TEST);		AA_DO_TEST);
	} else if (strcmp(command, "permipc") == 0) {
	error = aa_setprocattr_permipc(args);
	} else {		} else {
	struct common_audit_data sa;		struct common_audit_data sa;
	struct apparmor_audit_data aad = {0,};		struct apparmor_audit_data aad = {0,};

security/apparmor/procattr.c

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -163,9 +163,3 @@ int aa_setprocattr_changeprofile(char *fqname, bool onexec, int test)
	name = aa_split_fqname(fqname, &ns_name);		name = aa_split_fqname(fqname, &ns_name);
	return aa_change_profile(ns_name, name, onexec, test);		return aa_change_profile(ns_name, name, onexec, test);
	}		}

	int aa_setprocattr_permipc(char *fqname)
	{
	/* TODO: add ipc permission querying */
	return -ENOTSUPP;
	}