From a93e6ee4c3a57f3fc1138d9ddb224cc55660a727 Mon Sep 17 00:00:00 2001 From: James Morris Date: Thu, 29 Jan 2009 12:30:28 +1100 Subject: [PATCH] --- yaml --- r: 132590 b: refs/heads/master c: ef76e748faa823a738d632ee4c8ed9adaabc8a40 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/selinux/hooks.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 190aa3671421..afc19103188c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca5143d3ff3c7a4e1c2c8bdcf0f53aea227a7722 +refs/heads/master: ef76e748faa823a738d632ee4c8ed9adaabc8a40 diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c index afccada1f262..3aaa63cc5c74 100644 --- a/trunk/security/selinux/hooks.c +++ b/trunk/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