Fix a username/password parsing bug for NTLM SMB helper (ntlm_auth).

diff --git a/helpers/ntlm_auth/SMB/libntlmssp.c b/helpers/ntlm_auth/SMB/libntlmssp.c
index 4f45b96bfa8ec726c85f49bdfdf16ddce1ad3426..d9b879d853115439b20ed0658c5fbcb479969ccc 100644 (file)
--- a/helpers/ntlm_auth/SMB/libntlmssp.c
+++ b/helpers/ntlm_auth/SMB/libntlmssp.c
@@ -161,7 +161,10 @@ make_challenge(char *domain, char *domain_controller)
 #define min(A,B) (A<B?A:B)
 
 int ntlm_errno;
-static char credentials[1024]; /* we can afford to waste */
+#define MAX_USERNAME_LEN 255
+#define MAX_DOMAIN_LEN 255
+#define MAX_PASSWD_LEN 31
+static char credentials[MAX_USERNAME_LEN+MAX_DOMAIN_LEN+2];    /* we can afford to waste */
 
 
 /* Fetches the user's credentials from the challenge.
@@ -197,7 +200,7 @@ char *
 ntlm_check_auth(ntlm_authenticate * auth, int auth_length)
 {
     int rv;
-    char pass[25] /*, encrypted_pass[40] */;
+    char pass[MAX_PASSWD_LEN+1];
     char *domain = credentials;
     char *user;
     lstring tmp;
@@ -215,8 +218,13 @@ ntlm_check_auth(ntlm_authenticate * auth, int auth_length)
        ntlm_errno = NTLM_LOGON_ERROR;
        return NULL;
     }
+    if (tmp.l > MAX_DOMAIN_LEN) {
+       debug("Domain string exceeds %d bytes, rejecting\n", MAX_DOMAIN_LEN);
+       ntlm_errno = NTLM_LOGON_ERROR;
+       return NULL;
+    }
     memcpy(domain, tmp.str, tmp.l);
-    user = domain + tmp.l;
+    user = domain + tmp.l + 1;
     *user++ = '\0';
 
 /*      debug("fetching user name\n"); */
@@ -226,20 +234,30 @@ ntlm_check_auth(ntlm_authenticate * auth, int auth_length)
        ntlm_errno = NTLM_LOGON_ERROR;
        return NULL;
     }
+    if (tmp.l > MAX_USERNAME_LEN) {
+       debug("Username string exceeds %d bytes, rejecting\n", MAX_USERNAME_LEN);
+       ntlm_errno = NTLM_LOGON_ERROR;
+       return NULL;
+    }
     memcpy(user, tmp.str, tmp.l);
     *(user + tmp.l) = '\0';
 
                
-               /* Authenticating against the NT response doesn't seem to work... */
+    /* Authenticating against the NT response doesn't seem to work... */
     tmp = ntlm_fetch_string((char *) auth, auth_length, &auth->lmresponse);
     if (tmp.str == NULL || tmp.l == 0) {
        fprintf(stderr, "No auth at all. Returning no-auth\n");
        ntlm_errno = NTLM_LOGON_ERROR;
        return NULL;
     }
-               
+    if (tmp.l > MAX_PASSWD_LEN) {
+       debug("Password string exceeds %d bytes, rejecting\n", MAX_PASSWD_LEN);
+       ntlm_errno = NTLM_LOGON_ERROR;
+       return NULL;
+    }
+
     memcpy(pass, tmp.str, tmp.l);
-    pass[25] = '\0';
+    pass[min(MAX_PASSWD_LEN,tmp.l)] = '\0';
 
 #if 1
                debug ("Empty LM pass detection: user: '%s', ours:'%s', his: '%s'"