X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/d1b7389cac0ce3c9ccbeede1ea604ad18e9cf965..675f67a20b0a94eef8288b0016f959a1597615cc:/smbutil.c

diff --git a/smbutil.c b/smbutil.c
index 0acb553f..63a36860 100644
--- a/smbutil.c
+++ b/smbutil.c
@@ -20,9 +20,20 @@
 #include "extract.h"
 #include "smb.h"
 
+static int stringlen_is_set;
 static uint32_t stringlen;
 extern const u_char *startbuf;
 
+/*
+ * Reset SMB state.
+ */
+void
+smb_reset(void)
+{
+    stringlen_is_set = 0;
+    stringlen = 0;
+}
+
 /*
  * interpret a 32 bit dos packed date/time to some parameters
  */
@@ -340,14 +351,14 @@ write_bits(netdissect_options *ndo,
 
 /* convert a UCS-2 string into an ASCII string */
 #define MAX_UNISTR_SIZE	1000
-static int
+static const u_char *
 unistr(netdissect_options *ndo, char (*buf)[MAX_UNISTR_SIZE+1],
-       const u_char *s, uint32_t *len, int is_null_terminated, int use_unicode)
+       const u_char *s, uint32_t strsize, int is_null_terminated,
+       int use_unicode)
 {
+    u_int c;
     size_t l = 0;
-    uint32_t strsize;
     const u_char *sp;
-    int padding = 0;
 
     if (use_unicode) {
 	/*
@@ -356,84 +367,111 @@ unistr(netdissect_options *ndo, char (*buf)[MAX_UNISTR_SIZE+1],
 	if (((s - startbuf) % 2) != 0) {
 	    ND_TCHECK_1(s);
 	    s++;
-	    padding++;
 	}
     }
     if (is_null_terminated) {
 	/*
 	 * Null-terminated string.
+	 * Find the length, counting the terminating NUL.
 	 */
 	strsize = 0;
 	sp = s;
 	if (!use_unicode) {
 	    for (;;) {
 		ND_TCHECK_1(sp);
-		*len += 1;
-		if (GET_U_1(sp) == 0)
-		    break;
+		c = GET_U_1(sp);
 		sp++;
+		strsize++;
+		if (c == '\0')
+		    break;
 	    }
-	    strsize = *len - 1;
 	} else {
 	    for (;;) {
 		ND_TCHECK_2(sp);
-		*len += 2;
-		if (GET_U_1(sp) == 0 && GET_U_1(sp + 1) == 0)
-		    break;
+		c = GET_LE_U_2(sp);
 		sp += 2;
+		strsize += 2;
+		if (c == '\0')
+		    break;
 	    }
-	    strsize = *len - 2;
 	}
-	*len += padding;
-    } else {
-	/*
-	 * Counted string.
-	 */
-	strsize = *len;
-	*len += padding;
     }
     if (!use_unicode) {
     	while (strsize != 0) {
-          ND_TCHECK_1(s);
-	    if (l >= MAX_UNISTR_SIZE)
-		break;
-	    if (ND_ISPRINT(GET_U_1(s)))
-		(*buf)[l] = GET_U_1(s);
-	    else {
-		if (GET_U_1(s) == 0)
-		    break;
-		(*buf)[l] = '.';
-	    }
-	    l++;
+	    ND_TCHECK_1(s);
+	    c = GET_U_1(s);
 	    s++;
 	    strsize--;
+	    if (c == 0) {
+		/*
+		 * Even counted strings may have embedded null
+		 * terminators, so quit here, and skip past
+		 * the rest of the data.
+		 *
+		 * Make sure, however, that the rest of the data
+		 * is there, so we don't overflow the buffer when
+		 * skipping past it.
+		 */
+		ND_TCHECK_LEN(s, strsize);
+		s += strsize;
+		strsize = 0;
+		break;
+	    }
+	    if (l < MAX_UNISTR_SIZE) {
+		if (ND_ISPRINT(c)) {
+		    /* It's a printable ASCII character */
+		    (*buf)[l] = c;
+		} else {
+		    /* It's a non-ASCII character or a non-printable ASCII character */
+		    (*buf)[l] = '.';
+		}
+		l++;
+	    }
 	}
     } else {
-	while (strsize != 0) {
+	while (strsize > 1) {
 	    ND_TCHECK_2(s);
-	    if (l >= MAX_UNISTR_SIZE)
-		break;
-	    if (GET_U_1(s + 1) == 0 && ND_ISPRINT(GET_U_1(s))) {
-		/* It's a printable ASCII character */
-		(*buf)[l] = GET_U_1(s);
-	    } else {
-		/* It's a non-ASCII character or a non-printable ASCII character */
-		if (GET_U_1(s) == 0 && GET_U_1(s + 1) == 0)
-		    break;
-		(*buf)[l] = '.';
-	    }
-	    l++;
+	    c = GET_LE_U_2(s);
 	    s += 2;
-	    if (strsize == 1)
-		break;
 	    strsize -= 2;
+	    if (c == 0) {
+		/*
+		 * Even counted strings may have embedded null
+		 * terminators, so quit here, and skip past
+		 * the rest of the data.
+		 *
+		 * Make sure, however, that the rest of the data
+		 * is there, so we don't overflow the buffer when
+		 * skipping past it.
+		 */
+		ND_TCHECK_LEN(s, strsize);
+		s += strsize;
+		strsize = 0;
+		break;
+	    }
+	    if (l < MAX_UNISTR_SIZE) {
+		if (ND_ISPRINT(c)) {
+		    /* It's a printable ASCII character */
+		    (*buf)[l] = c;
+		} else {
+		    /* It's a non-ASCII character or a non-printable ASCII character */
+		    (*buf)[l] = '.';
+		}
+		l++;
+	    }
+	}
+	if (strsize == 1) {
+	    /* We have half of a code point; skip past it */
+	    ND_TCHECK_1(s);
+	    s++;
 	}
     }
     (*buf)[l] = 0;
-    return 0;
+    return s;
 
 trunc:
-    return -1;
+    (*buf)[l] = 0;
+    return NULL;
 }
 
 static const u_char *
@@ -617,6 +655,7 @@ smb_fdata1(netdissect_options *ndo,
 	    case 'b':
 		ND_TCHECK_1(buf);
 		stringlen = GET_U_1(buf);
+		stringlen_is_set = 1;
 		ND_PRINT("%u", stringlen);
 		buf += 1;
 		break;
@@ -626,6 +665,7 @@ smb_fdata1(netdissect_options *ndo,
 		ND_TCHECK_2(buf);
 		stringlen = reverse ? GET_BE_U_2(buf) :
 				      GET_LE_U_2(buf);
+		stringlen_is_set = 1;
 		ND_PRINT("%u", stringlen);
 		buf += 2;
 		break;
@@ -635,6 +675,7 @@ smb_fdata1(netdissect_options *ndo,
 		ND_TCHECK_4(buf);
 		stringlen = reverse ? GET_BE_U_4(buf) :
 				      GET_LE_U_4(buf);
+		stringlen_is_set = 1;
 		ND_PRINT("%u", stringlen);
 		buf += 4;
 		break;
@@ -646,31 +687,25 @@ smb_fdata1(netdissect_options *ndo,
 	case 'R':	/* like 'S', but always ASCII */
 	  {
 	    /*XXX unistr() */
-	    uint32_t len;
-
-	    len = 0;
-	    if (unistr(ndo, &strbuf, buf, &len, 1, (*fmt == 'R') ? 0 : unicodestr) == -1)
-		goto trunc;
+	    buf = unistr(ndo, &strbuf, buf, 0, 1, (*fmt == 'R') ? 0 : unicodestr);
 	    ND_PRINT("%s", strbuf);
-	    buf += len;
+	    if (buf == NULL)
+		goto trunc;
 	    fmt++;
 	    break;
 	  }
 	case 'Z':
 	case 'Y':	/* like 'Z', but always ASCII */
 	  {
-	    uint32_t len;
-
 	    ND_TCHECK_1(buf);
 	    if (GET_U_1(buf) != 4 && GET_U_1(buf) != 2) {
 		ND_PRINT("Error! ASCIIZ buffer of type %u", GET_U_1(buf));
 		return maxbuf;	/* give up */
 	    }
-	    len = 0;
-	    if (unistr(ndo, &strbuf, buf + 1, &len, 1, (*fmt == 'Y') ? 0 : unicodestr) == -1)
-		goto trunc;
+	    buf = unistr(ndo, &strbuf, buf + 1, 0, 1, (*fmt == 'Y') ? 0 : unicodestr);
 	    ND_PRINT("%s", strbuf);
-	    buf += len + 1;
+	    if (buf == NULL)
+		goto trunc;
 	    fmt++;
 	    break;
 	  }
@@ -687,6 +722,10 @@ smb_fdata1(netdissect_options *ndo,
 	  }
 	case 'c':
 	  {
+            if (!stringlen_is_set) {
+                ND_PRINT("{stringlen not set}");
+                goto trunc;
+            }
 	    ND_TCHECK_LEN(buf, stringlen);
 	    ND_PRINT("%-*.*s", (int)stringlen, (int)stringlen, buf);
 	    buf += stringlen;
@@ -697,10 +736,14 @@ smb_fdata1(netdissect_options *ndo,
 	  }
 	case 'C':
 	  {
-	    if (unistr(ndo, &strbuf, buf, &stringlen, 0, unicodestr) == -1)
-		goto trunc;
+            if (!stringlen_is_set) {
+                ND_PRINT("{stringlen not set}");
+                goto trunc;
+            }
+	    buf = unistr(ndo, &strbuf, buf, stringlen, 0, unicodestr);
 	    ND_PRINT("%s", strbuf);
-	    buf += stringlen;
+	    if (buf == NULL)
+		goto trunc;
 	    fmt++;
 	    break;
 	  }
@@ -872,8 +915,17 @@ smb_fdata(netdissect_options *ndo,
 	    s[p - fmt] = '\0';
 	    fmt = p + 1;
 	    buf = smb_fdata1(ndo, buf, s, maxbuf, unicodestr);
-	    if (buf == NULL)
+	    if (buf == NULL) {
+		/*
+		 * Truncated.
+		 * Is the next character a newline?
+		 * If so, print it before quitting, so we don't
+		 * get stuff in the middle of the line.
+		 */
+		if (*fmt == '\n')
+		    ND_PRINT("\n");
 		return(NULL);
+	    }
 	    break;
 
 	default:
@@ -1022,17 +1074,17 @@ smb_errstr(int class, int num)
 		const err_code_struct *err = err_classes[i].err_msgs;
 		for (j = 0; err[j].name; j++)
 		    if (num == err[j].code) {
-			nd_snprintf(ret, sizeof(ret), "%s - %s (%s)",
+			snprintf(ret, sizeof(ret), "%s - %s (%s)",
 			    err_classes[i].class, err[j].name, err[j].message);
 			return ret;
 		    }
 	    }
 
-	    nd_snprintf(ret, sizeof(ret), "%s - %d", err_classes[i].class, num);
+	    snprintf(ret, sizeof(ret), "%s - %d", err_classes[i].class, num);
 	    return ret;
 	}
 
-    nd_snprintf(ret, sizeof(ret), "ERROR: Unknown error (%d,%d)", class, num);
+    snprintf(ret, sizeof(ret), "ERROR: Unknown error (%d,%d)", class, num);
     return(ret);
 }
 
@@ -1913,6 +1965,6 @@ nt_errstr(uint32_t err)
 	    return nt_errors[i].name;
     }
 
-    nd_snprintf(ret, sizeof(ret), "0x%08x", err);
+    snprintf(ret, sizeof(ret), "0x%08x", err);
     return ret;
 }