Merge branch 'drm-ttm-unmappable' into drm-core-next

[pandora-kernel.git] / net / sunrpc / auth_gss / gss_spkm3_seal.c

diff --git a/net/sunrpc/auth_gss/gss_spkm3_seal.c b/net/sunrpc/auth_gss/gss_spkm3_seal.c
index abf17ce..5a3a65a 100644 (file)
--- a/net/sunrpc/auth_gss/gss_spkm3_seal.c
+++ b/net/sunrpc/auth_gss/gss_spkm3_seal.c
@@ -34,7 +34,6 @@
  */
 
 #include <linux/types.h>
-#include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/sunrpc/gss_spkm3.h>
 #include <linux/random.h>
@@ -107,10 +106,10 @@ spkm3_make_token(struct spkm3_ctx *ctx,
                tokenlen = 10 + ctxelen + 1 + md5elen + 1;
 
                /* Create token header using generic routines */
-               token->len = g_token_size(&ctx->mech_used, tokenlen);
+               token->len = g_token_size(&ctx->mech_used, tokenlen + 2);
 
                ptr = token->data;
-               g_make_token_header(&ctx->mech_used, tokenlen, &ptr);
+               g_make_token_header(&ctx->mech_used, tokenlen + 2, &ptr);
 
                spkm3_make_mic_token(&ptr, tokenlen, &mic_hdr, &md5cksum, md5elen, md5zbit);
        } else if (toktype == SPKM_WRAP_TOK) { /* Not Supported */