Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / security / keys / request_key.c

diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index ba32ca6469bdf2e74a8b0f9cb94d27604b7251af..abea08f87fe20e4dc14b75bea5c7bbe67c659ba3 100644 (file)
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -74,6 +74,10 @@ static int call_sbin_request_key(struct key_construction *cons,
 
        kenter("{%d},{%d},%s", key->serial, authkey->serial, op);
 
+       ret = install_user_keyrings(tsk);
+       if (ret < 0)
+               goto error_alloc;
+
        /* allocate a new session keyring */
        sprintf(desc, "_req.%u", key->serial);