Merge tag 'stable/for-linus-3.7-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / fs / cifs / cifs_spnego.c

diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c
index e622863b292f736fc8cc6e5d2ab8105986ad83bf..086f381d648954c4001542be40b3ba6beffbceb0 100644 (file)
--- a/fs/cifs/cifs_spnego.c
+++ b/fs/cifs/cifs_spnego.c
@@ -31,18 +31,18 @@
 
 /* create a new cifs key */
 static int
-cifs_spnego_key_instantiate(struct key *key, const void *data, size_t datalen)
+cifs_spnego_key_instantiate(struct key *key, struct key_preparsed_payload *prep)
 {
        char *payload;
        int ret;
 
        ret = -ENOMEM;
-       payload = kmalloc(datalen, GFP_KERNEL);
+       payload = kmalloc(prep->datalen, GFP_KERNEL);
        if (!payload)
                goto error;
 
        /* attach the data */
-       memcpy(payload, data, datalen);
+       memcpy(payload, prep->data, prep->datalen);
        key->payload.data = payload;
        ret = 0;