diff options
| author | James Morris <james.l.morris@oracle.com> | 2017-12-09 14:39:48 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-12-09 14:39:48 +1100 |
| commit | 4ded3bec65a07343258ed8fd9d46483f032d866f (patch) | |
| tree | ecb134c1ac71a1c4ca59b50d4d097de7c3939cbf /security/keys/key.c | |
| parent | f335195adf043168ee69d78ea72ac3e30f0c57ce (diff) | |
| parent | 54c1fb39fe0495f846539ab765925b008f86801c (diff) | |
Merge tag 'keys-fixes-20171208' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into keys-for-linus
Assorted fixes for keyrings, ASN.1, X.509 and PKCS#7.
Diffstat (limited to 'security/keys/key.c')
| -rw-r--r-- | security/keys/key.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/security/keys/key.c b/security/keys/key.c index 66049183ad89..d97c9394b5dd 100644 --- a/security/keys/key.c +++ b/security/keys/key.c @@ -833,7 +833,6 @@ key_ref_t key_create_or_update(key_ref_t keyring_ref, key_check(keyring); - key_ref = ERR_PTR(-EPERM); if (!(flags & KEY_ALLOC_BYPASS_RESTRICTION)) restrict_link = keyring->restrict_link; |