summaryrefslogtreecommitdiff
path: root/security/keys/keyctl.c
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2010-04-07 15:15:19 -0400
committerJames Morris <jmorris@namei.org>2010-04-12 12:19:18 +1000
commit3011a344cdcda34cdbcb40c3fb3d1a6e89954abb (patch)
tree43db9abc5f96cd8ec31a4a24f0d52dae76680a1c /security/keys/keyctl.c
parent6307f8fee295b364716d28686df6e69c2fee751a (diff)
security: remove dead hook key_session_to_parent
Unused hook. Remove. Signed-off-by: Eric Paris <eparis@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/keys/keyctl.c')
-rw-r--r--security/keys/keyctl.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index e9c2e7c584d9..34b302b40dea 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -1295,13 +1295,6 @@ long keyctl_session_to_parent(void)
mycred->tgcred->session_keyring->uid != mycred->euid)
goto not_permitted;
- /* the LSM must permit the replacement of the parent's keyring with the
- * keyring from this process */
- ret = security_key_session_to_parent(mycred, pcred,
- key_ref_to_ptr(keyring_r));
- if (ret < 0)
- goto not_permitted;
-
/* if there's an already pending keyring replacement, then we replace
* that */
oldcred = parent->replacement_session_keyring;