aboutsummaryrefslogtreecommitdiff
path: root/security/apparmor/include/resource.h
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2010-09-06 10:10:20 -0700
committerJames Morris <jmorris@namei.org>2010-09-08 09:19:29 +1000
commit3a2dc8382a3e85a51ed9c6f57ea80665ea7a0c95 (patch)
tree05b289dc97bf08459911d0b5500896ed80af25c7 /security/apparmor/include/resource.h
parente819ff519b2d74373eca4a9a2b417ebf4c1e1b29 (diff)
downloadlinux-2.6.38-lt-ux500-3a2dc8382a3e85a51ed9c6f57ea80665ea7a0c95.tar.gz
AppArmor: Fix security_task_setrlimit logic for 2.6.36 changes
2.6.36 introduced the abilitiy to specify the task that is having its rlimits set. Update mediation to ensure that confined tasks can only set their own group_leader as expected by current policy. Add TODO note about extending policy to support setting other tasks rlimits. Signed-off-by: John Johansen <john.johansen@canonical.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/apparmor/include/resource.h')
-rw-r--r--security/apparmor/include/resource.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/include/resource.h b/security/apparmor/include/resource.h
index 3c88be94649..02baec732bb 100644
--- a/security/apparmor/include/resource.h
+++ b/security/apparmor/include/resource.h
@@ -33,8 +33,8 @@ struct aa_rlimit {
};
int aa_map_resource(int resource);
-int aa_task_setrlimit(struct aa_profile *profile, unsigned int resource,
- struct rlimit *new_rlim);
+int aa_task_setrlimit(struct aa_profile *profile, struct task_struct *,
+ unsigned int resource, struct rlimit *new_rlim);
void __aa_transition_rlimits(struct aa_profile *old, struct aa_profile *new);