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 prototypehifive-unleashed-5.1
commit
3b89f56783
|
@ -607,8 +607,8 @@ static int apparmor_setprocattr(struct task_struct *task, char *name,
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int apparmor_task_setrlimit(unsigned int resource,
|
static int apparmor_task_setrlimit(struct task_struct *task,
|
||||||
struct rlimit *new_rlim)
|
unsigned int resource, struct rlimit *new_rlim)
|
||||||
{
|
{
|
||||||
struct aa_profile *profile = aa_current_profile();
|
struct aa_profile *profile = aa_current_profile();
|
||||||
int error = 0;
|
int error = 0;
|
||||||
|
|
Loading…
Reference in New Issue