cifs: account for new creduid=0x%x parameter in spnego upcall string
authorJeff Layton <jlayton@redhat.com>
Tue, 3 Aug 2010 14:19:50 +0000 (10:19 -0400)
committerSteve French <sfrench@us.ibm.com>
Thu, 5 Aug 2010 17:17:50 +0000 (17:17 +0000)
The commit that added the creduid=0x%x parameter failed to increase the
buffer allocation to account for it.

Reported-by: J. Bruce Fields <bfields@fieldses.org>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
fs/cifs/cifs_spnego.c

index 6effccff85a50d742c23122ea155087c63191909..87044906cd1fafeb37541588d6d31d96c55e147e 100644 (file)
@@ -84,6 +84,9 @@ struct key_type cifs_spnego_key_type = {
 /* strlen of ";uid=0x" */
 #define UID_KEY_LEN            7
 
+/* strlen of ";creduid=0x" */
+#define CREDUID_KEY_LEN                11
+
 /* strlen of ";user=" */
 #define USER_KEY_LEN           6
 
@@ -107,6 +110,7 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo)
                   IP_KEY_LEN + INET6_ADDRSTRLEN +
                   MAX_MECH_STR_LEN +
                   UID_KEY_LEN + (sizeof(uid_t) * 2) +
+                  CREDUID_KEY_LEN + (sizeof(uid_t) * 2) +
                   USER_KEY_LEN + strlen(sesInfo->userName) +
                   PID_KEY_LEN + (sizeof(pid_t) * 2) + 1;