Merge tag 'f2fs-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[~andy/linux] / security / keys / user_defined.c

diff --git a/security/keys/user_defined.c b/security/keys/user_defined.c
index c7660a25a3e4502673714b39553a0d9d00873672..55dc88939185812f70145427b96c991ed6d636e2 100644 (file)
--- a/security/keys/user_defined.c
+++ b/security/keys/user_defined.c
@@ -58,13 +58,14 @@ EXPORT_SYMBOL_GPL(key_type_logon);
 /*
  * instantiate a user defined key
  */
-int user_instantiate(struct key *key, const void *data, size_t datalen)
+int user_instantiate(struct key *key, struct key_preparsed_payload *prep)
 {
        struct user_key_payload *upayload;
+       size_t datalen = prep->datalen;
        int ret;
 
        ret = -EINVAL;
-       if (datalen <= 0 || datalen > 32767 || !data)
+       if (datalen <= 0 || datalen > 32767 || !prep->data)
                goto error;
 
        ret = key_payload_reserve(key, datalen);
@@ -78,7 +79,7 @@ int user_instantiate(struct key *key, const void *data, size_t datalen)
 
        /* attach the data */
        upayload->datalen = datalen;
-       memcpy(upayload->data, data, datalen);
+       memcpy(upayload->data, prep->data, datalen);
        rcu_assign_keypointer(key, upayload);
        ret = 0;
 
@@ -92,13 +93,14 @@ EXPORT_SYMBOL_GPL(user_instantiate);
  * update a user defined key
  * - the key's semaphore is write-locked
  */
-int user_update(struct key *key, const void *data, size_t datalen)
+int user_update(struct key *key, struct key_preparsed_payload *prep)
 {
        struct user_key_payload *upayload, *zap;
+       size_t datalen = prep->datalen;
        int ret;
 
        ret = -EINVAL;
-       if (datalen <= 0 || datalen > 32767 || !data)
+       if (datalen <= 0 || datalen > 32767 || !prep->data)
                goto error;
 
        /* construct a replacement payload */
@@ -108,7 +110,7 @@ int user_update(struct key *key, const void *data, size_t datalen)
                goto error;
 
        upayload->datalen = datalen;
-       memcpy(upayload->data, data, datalen);
+       memcpy(upayload->data, prep->data, datalen);
 
        /* check the quota and attach the new data */
        zap = upayload;