diff options
| author | Eric Paris <eparis@redhat.com> | 2010-04-07 15:15:19 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-04-12 12:19:18 +1000 |
| commit | 3011a344cdcda34cdbcb40c3fb3d1a6e89954abb (patch) | |
| tree | 43db9abc5f96cd8ec31a4a24f0d52dae76680a1c /security | |
| parent | 6307f8fee295b364716d28686df6e69c2fee751a (diff) | |
| download | linux-3.10-3011a344cdcda34cdbcb40c3fb3d1a6e89954abb.tar.gz linux-3.10-3011a344cdcda34cdbcb40c3fb3d1a6e89954abb.tar.bz2 linux-3.10-3011a344cdcda34cdbcb40c3fb3d1a6e89954abb.zip | |
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')
| -rw-r--r-- | security/capability.c | 8 | ||||
| -rw-r--r-- | security/keys/keyctl.c | 7 | ||||
| -rw-r--r-- | security/security.c | 7 |
3 files changed, 0 insertions, 22 deletions
diff --git a/security/capability.c b/security/capability.c index 247c04edd46..8cc2b8f3b16 100644 --- a/security/capability.c +++ b/security/capability.c @@ -826,13 +826,6 @@ static int cap_key_getsecurity(struct key *key, char **_buffer) return 0; } -static int cap_key_session_to_parent(const struct cred *cred, - const struct cred *parent_cred, - struct key *key) -{ - return 0; -} - #endif /* CONFIG_KEYS */ #ifdef CONFIG_AUDIT @@ -1053,7 +1046,6 @@ void security_fixup_ops(struct security_operations *ops) set_to_cap_if_null(ops, key_free); set_to_cap_if_null(ops, key_permission); set_to_cap_if_null(ops, key_getsecurity); - set_to_cap_if_null(ops, key_session_to_parent); #endif /* CONFIG_KEYS */ #ifdef CONFIG_AUDIT set_to_cap_if_null(ops, audit_rule_init); diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index e9c2e7c584d..34b302b40de 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; diff --git a/security/security.c b/security/security.c index 5cf9ca6890f..490f77753b2 100644 --- a/security/security.c +++ b/security/security.c @@ -1262,13 +1262,6 @@ int security_key_getsecurity(struct key *key, char **_buffer) return security_ops->key_getsecurity(key, _buffer); } -int security_key_session_to_parent(const struct cred *cred, - const struct cred *parent_cred, - struct key *key) -{ - return security_ops->key_session_to_parent(cred, parent_cred, key); -} - #endif /* CONFIG_KEYS */ #ifdef CONFIG_AUDIT |