aboutsummaryrefslogtreecommitdiffstats
path: root/security/keys
diff options
context:
space:
mode:
Diffstat (limited to 'security/keys')
-rw-r--r--security/keys/keyctl.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 3364fbf46807..6cfc6478863e 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -1486,7 +1486,6 @@ long keyctl_session_to_parent(void)
1486 oldwork = NULL; 1486 oldwork = NULL;
1487 parent = me->real_parent; 1487 parent = me->real_parent;
1488 1488
1489 task_lock(parent);
1490 /* the parent mustn't be init and mustn't be a kernel thread */ 1489 /* the parent mustn't be init and mustn't be a kernel thread */
1491 if (parent->pid <= 1 || !parent->mm) 1490 if (parent->pid <= 1 || !parent->mm)
1492 goto unlock; 1491 goto unlock;
@@ -1530,7 +1529,6 @@ long keyctl_session_to_parent(void)
1530 if (!ret) 1529 if (!ret)
1531 newwork = NULL; 1530 newwork = NULL;
1532unlock: 1531unlock:
1533 task_unlock(parent);
1534 write_unlock_irq(&tasklist_lock); 1532 write_unlock_irq(&tasklist_lock);
1535 rcu_read_unlock(); 1533 rcu_read_unlock();
1536 if (oldwork) 1534 if (oldwork)