diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-07-08 22:49:00 -0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-07-08 22:49:00 -0400 |
| commit | e1e5fa961612d774c122fc79f93a50a9dc8db321 (patch) | |
| tree | 0bbb655a3bbdc70e7f1aeb6d10b6a9bf8f8dd2d2 /security | |
| parent | c632809953fbde9e74394eae2de9d1f5e60ac427 (diff) | |
| parent | 9552c7aebb8c36912612fddad5b55267c671a303 (diff) | |
Merge tag 'keys-misc-20160708' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/persistent.c | 2 | ||||
| -rw-r--r-- | security/keys/request_key.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/security/keys/persistent.c b/security/keys/persistent.c index 2ef45b319dd9..1edc1f0a0ce2 100644 --- a/security/keys/persistent.c +++ b/security/keys/persistent.c | |||
| @@ -114,7 +114,7 @@ found: | |||
| 114 | ret = key_link(key_ref_to_ptr(dest_ref), persistent); | 114 | ret = key_link(key_ref_to_ptr(dest_ref), persistent); |
| 115 | if (ret == 0) { | 115 | if (ret == 0) { |
| 116 | key_set_timeout(persistent, persistent_keyring_expiry); | 116 | key_set_timeout(persistent, persistent_keyring_expiry); |
| 117 | ret = persistent->serial; | 117 | ret = persistent->serial; |
| 118 | } | 118 | } |
| 119 | } | 119 | } |
| 120 | 120 | ||
diff --git a/security/keys/request_key.c b/security/keys/request_key.c index a29e3554751e..43affcf10b22 100644 --- a/security/keys/request_key.c +++ b/security/keys/request_key.c | |||
| @@ -442,7 +442,7 @@ static struct key *construct_key_and_link(struct keyring_search_context *ctx, | |||
| 442 | 442 | ||
| 443 | if (ctx->index_key.type == &key_type_keyring) | 443 | if (ctx->index_key.type == &key_type_keyring) |
| 444 | return ERR_PTR(-EPERM); | 444 | return ERR_PTR(-EPERM); |
| 445 | 445 | ||
| 446 | user = key_user_lookup(current_fsuid()); | 446 | user = key_user_lookup(current_fsuid()); |
| 447 | if (!user) | 447 | if (!user) |
| 448 | return ERR_PTR(-ENOMEM); | 448 | return ERR_PTR(-ENOMEM); |