Merge tag 'powerpc-4.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[firefly-linux-kernel-4.4.55.git] / security / keys / process_keys.c

diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index 43b4cddbf2b39ebd838e3849a1e59e9c7c22c945..a3f85d2a00bb469391fc9a9a504c949e653d4a16 100644 (file)
--- a/security/keys/process_keys.c
+++ b/security/keys/process_keys.c
@@ -457,7 +457,7 @@ key_ref_t search_process_keyrings(struct keyring_search_context *ctx)
                down_read(&cred->request_key_auth->sem);
 
                if (key_validate(ctx->cred->request_key_auth) == 0) {
-                       rka = ctx->cred->request_key_auth->payload.data;
+                       rka = ctx->cred->request_key_auth->payload.data[0];
 
                        ctx->cred = rka->cred;
                        key_ref = search_process_keyrings(ctx);
@@ -647,7 +647,7 @@ try_again:
                        key_ref = ERR_PTR(-EKEYREVOKED);
                        key = NULL;
                } else {
-                       rka = ctx.cred->request_key_auth->payload.data;
+                       rka = ctx.cred->request_key_auth->payload.data[0];
                        key = rka->dest_keyring;
                        __key_get(key);
                }