diff options
author | James Morris <james.l.morris@oracle.com> | 2015-10-23 04:07:52 +0300 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2015-10-23 04:07:52 +0300 |
commit | ba94c3ff20c9c179f2a80f0e4c71e1571ebbf5c7 (patch) | |
tree | 8f94d0fcb68cdcff0d00a7911ddb494705cf7c72 /security/keys/request_key.c | |
parent | a47c7a6c8aff0563c0ef4adf299268f3c27af0f6 (diff) | |
parent | 146aa8b1453bd8f1ff2304ffb71b4ee0eb9acdcc (diff) | |
download | linux-ba94c3ff20c9c179f2a80f0e4c71e1571ebbf5c7.tar.xz |
Merge tag 'keys-next-20151021' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'security/keys/request_key.c')
-rw-r--r-- | security/keys/request_key.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/keys/request_key.c b/security/keys/request_key.c index 486ef6fa393b..95d5cfc172c6 100644 --- a/security/keys/request_key.c +++ b/security/keys/request_key.c @@ -271,7 +271,7 @@ static void construct_get_dest_keyring(struct key **_dest_keyring) if (cred->request_key_auth) { authkey = cred->request_key_auth; down_read(&authkey->sem); - rka = authkey->payload.data; + rka = authkey->payload.data[0]; if (!test_bit(KEY_FLAG_REVOKED, &authkey->flags)) dest_keyring = @@ -593,7 +593,7 @@ int wait_for_key_construction(struct key *key, bool intr) return -ERESTARTSYS; if (test_bit(KEY_FLAG_NEGATIVE, &key->flags)) { smp_rmb(); - return key->type_data.reject_error; + return key->reject_error; } return key_validate(key); } |