Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b89f567 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  AppArmor: fix task_setrlimit prototype
parents 392abeea 7cb4dc9f

security/apparmor/lsm.c

+2 −2
Original line number Diff line number Diff line
@@ -607,8 +607,8 @@ static int apparmor_setprocattr(struct task_struct *task, char *name, 
	return error;

}



static int apparmor_task_setrlimit(unsigned int resource,

				   struct rlimit *new_rlim)

static int apparmor_task_setrlimit(struct task_struct *task,

		unsigned int resource, struct rlimit *new_rlim)

{

	struct aa_profile *profile = aa_current_profile();

	int error = 0;