aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-01-28 20:30:28 -0500
committerJames Morris <jmorris@namei.org>2009-01-29 16:55:13 -0500
commitef76e748faa823a738d632ee4c8ed9adaabc8a40 (patch)
treeaf59b8bad81255e4b22e36749dd702cb8db543b1
parentca5143d3ff3c7a4e1c2c8bdcf0f53aea227a7722 (diff)
selinux: remove secondary ops call to task_setrlimit
Remove secondary ops call to task_setrlimit, which is a noop in capabilities. Acked-by: Serge Hallyn <serue@us.ibm.com> Acked-by: Eric Paris <eparis@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
-rw-r--r--security/selinux/hooks.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index afccada1f262..3aaa63cc5c74 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -3367,11 +3367,6 @@ static int selinux_task_getioprio(struct task_struct *p)
3367static int selinux_task_setrlimit(unsigned int resource, struct rlimit *new_rlim) 3367static int selinux_task_setrlimit(unsigned int resource, struct rlimit *new_rlim)
3368{ 3368{
3369 struct rlimit *old_rlim = current->signal->rlim + resource; 3369 struct rlimit *old_rlim = current->signal->rlim + resource;
3370 int rc;
3371
3372 rc = secondary_ops->task_setrlimit(resource, new_rlim);
3373 if (rc)
3374 return rc;
3375 3370
3376 /* Control the ability to change the hard limit (whether 3371 /* Control the ability to change the hard limit (whether
3377 lowering or raising it), so that the hard limit can 3372 lowering or raising it), so that the hard limit can