summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-01-29 12:30:28 +1100
committerJames Morris <jmorris@namei.org>2009-01-30 08:55:13 +1100
commitef76e748faa823a738d632ee4c8ed9adaabc8a40 (patch)
treeaf59b8bad81255e4b22e36749dd702cb8db543b1 /security
parentca5143d3ff3c7a4e1c2c8bdcf0f53aea227a7722 (diff)
downloadlinux-stable-ef76e748faa823a738d632ee4c8ed9adaabc8a40.tar.gz
linux-stable-ef76e748faa823a738d632ee4c8ed9adaabc8a40.tar.bz2
linux-stable-ef76e748faa823a738d632ee4c8ed9adaabc8a40.zip
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>
Diffstat (limited to 'security')
-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)
static int selinux_task_setrlimit(unsigned int resource, struct rlimit *new_rlim)
{
struct rlimit *old_rlim = current->signal->rlim + resource;
- int rc;
-
- rc = secondary_ops->task_setrlimit(resource, new_rlim);
- if (rc)
- return rc;
/* Control the ability to change the hard limit (whether
lowering or raising it), so that the hard limit can