diff options
| author | Paul Moore <pmoore@redhat.com> | 2014-08-05 21:44:22 +0200 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2014-08-05 21:44:22 +0200 |
| commit | aa9e0de81b5b257f6dae48efe2ed5f255f066497 (patch) | |
| tree | 9b0b791d5912368006115427e74105cfe26750bd /security/keys/persistent.c | |
| parent | netlabel: shorter names for the NetLabel catmap funcs/structs (diff) | |
| parent | Linux 3.16 (diff) | |
| download | linux-aa9e0de81b5b257f6dae48efe2ed5f255f066497.tar.xz linux-aa9e0de81b5b257f6dae48efe2ed5f255f066497.zip | |
Merge tag 'v3.16' into next
Linux 3.16
Diffstat (limited to 'security/keys/persistent.c')
| -rw-r--r-- | security/keys/persistent.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/keys/persistent.c b/security/keys/persistent.c index 0ad3ee283781..c9fae5ea89fe 100644 --- a/security/keys/persistent.c +++ b/security/keys/persistent.c @@ -108,7 +108,7 @@ static long key_get_persistent(struct user_namespace *ns, kuid_t uid, return PTR_ERR(persistent_ref); found: - ret = key_task_permission(persistent_ref, current_cred(), KEY_LINK); + ret = key_task_permission(persistent_ref, current_cred(), KEY_NEED_LINK); if (ret == 0) { persistent = key_ref_to_ptr(persistent_ref); ret = key_link(key_ref_to_ptr(dest_ref), persistent); @@ -151,7 +151,7 @@ long keyctl_get_persistent(uid_t _uid, key_serial_t destid) } /* There must be a destination keyring */ - dest_ref = lookup_user_key(destid, KEY_LOOKUP_CREATE, KEY_WRITE); + dest_ref = lookup_user_key(destid, KEY_LOOKUP_CREATE, KEY_NEED_WRITE); if (IS_ERR(dest_ref)) return PTR_ERR(dest_ref); if (key_ref_to_ptr(dest_ref)->type != &key_type_keyring) { |