include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / net / sunrpc / auth_gss / gss_krb5_unseal.c

diff --git a/net/sunrpc/auth_gss/gss_krb5_unseal.c b/net/sunrpc/auth_gss/gss_krb5_unseal.c
index e30a993..ce6c247 100644 (file)
--- a/net/sunrpc/auth_gss/gss_krb5_unseal.c
+++ b/net/sunrpc/auth_gss/gss_krb5_unseal.c
@@ -58,7 +58,6 @@
  */
 
 #include <linux/types.h>
-#include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/sunrpc/gss_krb5.h>
 #include <linux/crypto.h>
@@ -82,7 +81,7 @@ gss_verify_mic_kerberos(struct gss_ctx *gss_ctx,
        struct xdr_netobj       md5cksum = {.len = 0, .data = cksumdata};
        s32                     now;
        int                     direction;
-       s32                     seqnum;
+       u32                     seqnum;
        unsigned char           *ptr = (unsigned char *)read_token->data;
        int                     bodysize;
 
@@ -92,30 +91,30 @@ gss_verify_mic_kerberos(struct gss_ctx *gss_ctx,
                                        read_token->len))
                return GSS_S_DEFECTIVE_TOKEN;
 
-       if ((*ptr++ != ((KG_TOK_MIC_MSG>>8)&0xff)) ||
-           (*ptr++ != ( KG_TOK_MIC_MSG    &0xff))   )
+       if ((ptr[0] != ((KG_TOK_MIC_MSG >> 8) & 0xff)) ||
+           (ptr[1] !=  (KG_TOK_MIC_MSG & 0xff)))
                return GSS_S_DEFECTIVE_TOKEN;
 
        /* XXX sanity-check bodysize?? */
 
-       signalg = ptr[0] + (ptr[1] << 8);
+       signalg = ptr[2] + (ptr[3] << 8);
        if (signalg != SGN_ALG_DES_MAC_MD5)
                return GSS_S_DEFECTIVE_TOKEN;
 
-       sealalg = ptr[2] + (ptr[3] << 8);
+       sealalg = ptr[4] + (ptr[5] << 8);
        if (sealalg != SEAL_ALG_NONE)
                return GSS_S_DEFECTIVE_TOKEN;
 
-       if ((ptr[4] != 0xff) || (ptr[5] != 0xff))
+       if ((ptr[6] != 0xff) || (ptr[7] != 0xff))
                return GSS_S_DEFECTIVE_TOKEN;
 
-       if (make_checksum("md5", ptr - 2, 8, message_buffer, 0, &md5cksum))
+       if (make_checksum("md5", ptr, 8, message_buffer, 0, &md5cksum))
                return GSS_S_FAILURE;
 
        if (krb5_encrypt(ctx->seq, NULL, md5cksum.data, md5cksum.data, 16))
                return GSS_S_FAILURE;
 
-       if (memcmp(md5cksum.data + 8, ptr + 14, 8))
+       if (memcmp(md5cksum.data + 8, ptr + GSS_KRB5_TOK_HDR_LEN, 8))
                return GSS_S_BAD_SIG;
 
        /* it got through unscathed.  Make sure the context is unexpired */
@@ -127,7 +126,7 @@ gss_verify_mic_kerberos(struct gss_ctx *gss_ctx,
 
        /* do sequencing checks */
 
-       if (krb5_get_seq_num(ctx->seq, ptr + 14, ptr + 6, &direction, &seqnum))
+       if (krb5_get_seq_num(ctx->seq, ptr + GSS_KRB5_TOK_HDR_LEN, ptr + 8, &direction, &seqnum))
                return GSS_S_FAILURE;
 
        if ((ctx->initiate && direction != 0xff) ||