---

yaml --- r: 132590 b: refs/heads/master c: ef76e74 h: refs/heads/master v: v3
git-mirror · Jan 29, 2009 · a93e6ee · a93e6ee
1 parent 7e0235b
commit a93e6ee
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git 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
@@ -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