Merge tag 'keys-next-20160505' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowe...

[deliverable/linux.git] / security / keys / request_key.c

diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index c7a117c9a8f3030d66afc6cbf5767ce5069c813b..a29e3554751e0862003b430ce116f52d182c27bb 100644 (file)
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -116,7 +116,7 @@ static int call_sbin_request_key(struct key_construction *cons,
        cred = get_current_cred();
        keyring = keyring_alloc(desc, cred->fsuid, cred->fsgid, cred,
                                KEY_POS_ALL | KEY_USR_VIEW | KEY_USR_READ,
-                               KEY_ALLOC_QUOTA_OVERRUN, NULL);
+                               KEY_ALLOC_QUOTA_OVERRUN, NULL, NULL);
        put_cred(cred);
        if (IS_ERR(keyring)) {
                ret = PTR_ERR(keyring);
@@ -355,7 +355,7 @@ static int construct_alloc_key(struct keyring_search_context *ctx,
 
        key = key_alloc(ctx->index_key.type, ctx->index_key.description,
                        ctx->cred->fsuid, ctx->cred->fsgid, ctx->cred,
-                       perm, flags);
+                       perm, flags, NULL);
        if (IS_ERR(key))
                goto alloc_failed;