From 3ac0a883c3851102a6f719b2d96b94ef96ca20b2 Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Sun, 26 Aug 2012 21:12:14 +0200 Subject: [PATCH] --- yaml --- r: 323603 b: refs/heads/master c: b3f68f16dbcde6fcdf0fd27695391ff7e9d41233 h: refs/heads/master i: 323601: cae29d8ed5e417fd4ff3f940fb277d4129882802 323599: 07b8f4ed96fa597bfdff265942837f7607814c45 v: v3 --- [refs] | 2 +- trunk/security/keys/keyctl.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cc20a8f77c9a..93ee6848ea48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9da33de62431c7839f98156720862262272a8380 +refs/heads/master: b3f68f16dbcde6fcdf0fd27695391ff7e9d41233 diff --git a/trunk/security/keys/keyctl.c b/trunk/security/keys/keyctl.c index 3364fbf46807..6cfc6478863e 100644 --- a/trunk/security/keys/keyctl.c +++ b/trunk/security/keys/keyctl.c @@ -1486,7 +1486,6 @@ long keyctl_session_to_parent(void) oldwork = NULL; parent = me->real_parent; - task_lock(parent); /* the parent mustn't be init and mustn't be a kernel thread */ if (parent->pid <= 1 || !parent->mm) goto unlock; @@ -1530,7 +1529,6 @@ long keyctl_session_to_parent(void) if (!ret) newwork = NULL; unlock: - task_unlock(parent); write_unlock_irq(&tasklist_lock); rcu_read_unlock(); if (oldwork)