X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/944a5e22aab5c62706df1acef419ac6432de8f29..refs/pull/1034/head:/smbutil.c

diff --git a/smbutil.c b/smbutil.c
index e567e0a1..f33a323f 100644
--- a/smbutil.c
+++ b/smbutil.c
@@ -16,6 +16,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "netdissect-ctype.h"
+
 #include "netdissect.h"
 #include "extract.h"
 #include "smb.h"
@@ -143,7 +145,6 @@ name_interpret(netdissect_options *ndo,
 
     if (in >= maxbuf)
 	return(-1);	/* name goes past the end of the buffer */
-    ND_TCHECK_1(in);
     len = GET_U_1(in) / 2;
     in++;
 
@@ -188,7 +189,6 @@ name_ptr(netdissect_options *ndo,
     p = buf + ofs;
     if (p >= maxbuf)
 	return(NULL);	/* name goes past the end of the buffer */
-    ND_TCHECK_1(p);
 
     c = GET_U_1(p);
 
@@ -242,14 +242,12 @@ name_len(netdissect_options *ndo,
 
     if (s >= maxbuf)
 	return(-1);	/* name goes past the end of the buffer */
-    ND_TCHECK_1(s);
     c = GET_U_1(s);
     if ((c & 0xC0) == 0xC0)
 	return(2);
     while (GET_U_1(s)) {
 	if (s >= maxbuf)
 	    return(-1);	/* name goes past the end of the buffer */
-	ND_TCHECK_1(s);
 	s += GET_U_1(s) + 1;
 	ND_TCHECK_1(s);
     }
@@ -294,7 +292,6 @@ smb_data_print(netdissect_options *ndo, const u_char *buf, u_int len)
 	return;
     ND_PRINT("[%03X] ", i);
     for (i = 0; i < len; /*nothing*/) {
-        ND_TCHECK_1(buf + i);
 	ND_PRINT("%02X ", GET_U_1(buf + i) & 0xff);
 	i++;
 	if (i%8 == 0)
@@ -318,7 +315,7 @@ smb_data_print(netdissect_options *ndo, const u_char *buf, u_int len)
 	while (n--)
 	    ND_PRINT("   ");
 
-	n = min(8, i % 16);
+	n = ND_MIN(8, i % 16);
 	print_asc(ndo, buf + i - (i % 16), n);
 	ND_PRINT(" ");
 	n = (i % 16) - n;
@@ -326,10 +323,6 @@ smb_data_print(netdissect_options *ndo, const u_char *buf, u_int len)
 	    print_asc(ndo, buf + i - n, n);
 	ND_PRINT("\n");
     }
-    return;
-
-trunc:
-    nd_print_trunc(ndo);
 }
 
 
@@ -351,15 +344,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) {
 	/*
@@ -368,7 +360,6 @@ 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) {
@@ -380,34 +371,24 @@ unistr(netdissect_options *ndo, char (*buf)[MAX_UNISTR_SIZE+1],
 	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);
 	    c = GET_U_1(s);
 	    s++;
 	    strsize--;
@@ -422,12 +403,14 @@ unistr(netdissect_options *ndo, char (*buf)[MAX_UNISTR_SIZE+1],
 		 * skipping past it.
 		 */
 		ND_TCHECK_LEN(s, strsize);
+		s += strsize;
+		strsize = 0;
 		break;
 	    }
 	    if (l < MAX_UNISTR_SIZE) {
-		if (ND_ISPRINT(c)) {
+		if (ND_ASCII_ISPRINT(c)) {
 		    /* It's a printable ASCII character */
-		    (*buf)[l] = c;
+		    (*buf)[l] = (char)c;
 		} else {
 		    /* It's a non-ASCII character or a non-printable ASCII character */
 		    (*buf)[l] = '.';
@@ -437,7 +420,6 @@ unistr(netdissect_options *ndo, char (*buf)[MAX_UNISTR_SIZE+1],
 	}
     } else {
 	while (strsize > 1) {
-	    ND_TCHECK_2(s);
 	    c = GET_LE_U_2(s);
 	    s += 2;
 	    strsize -= 2;
@@ -452,12 +434,14 @@ unistr(netdissect_options *ndo, char (*buf)[MAX_UNISTR_SIZE+1],
 		 * skipping past it.
 		 */
 		ND_TCHECK_LEN(s, strsize);
+		s += strsize;
+		strsize = 0;
 		break;
 	    }
 	    if (l < MAX_UNISTR_SIZE) {
-		if (ND_ISPRINT(c)) {
+		if (ND_ASCII_ISPRINT(c)) {
 		    /* It's a printable ASCII character */
-		    (*buf)[l] = c;
+		    (*buf)[l] = (char)c;
 		} else {
 		    /* It's a non-ASCII character or a non-printable ASCII character */
 		    (*buf)[l] = '.';
@@ -472,11 +456,11 @@ unistr(netdissect_options *ndo, char (*buf)[MAX_UNISTR_SIZE+1],
 	}
     }
     (*buf)[l] = 0;
-    return 0;
+    return s;
 
 trunc:
     (*buf)[l] = 0;
-    return -1;
+    return NULL;
 }
 
 static const u_char *
@@ -491,14 +475,12 @@ smb_fdata1(netdissect_options *ndo,
     while (*fmt && buf<maxbuf) {
 	switch (*fmt) {
 	case 'a':
-	    ND_TCHECK_1(buf);
 	    write_bits(ndo, GET_U_1(buf), attrib_fmt);
 	    buf++;
 	    fmt++;
 	    break;
 
 	case 'A':
-	    ND_TCHECK_2(buf);
 	    write_bits(ndo, GET_LE_U_2(buf), attrib_fmt);
 	    buf += 2;
 	    fmt++;
@@ -519,7 +501,6 @@ smb_fdata1(netdissect_options *ndo,
 	    strncpy(bitfmt, fmt, l);
 	    bitfmt[l] = '\0';
 	    fmt = p + 1;
-	    ND_TCHECK_1(buf);
 	    write_bits(ndo, GET_U_1(buf), bitfmt);
 	    buf++;
 	    break;
@@ -531,7 +512,7 @@ smb_fdata1(netdissect_options *ndo,
 	    ND_TCHECK_LEN(buf, l);
 	    buf += l;
 	    fmt++;
-	    while (isdigit((unsigned char)*fmt))
+	    while (ND_ASCII_ISDIGIT(*fmt))
 		fmt++;
 	    break;
 	  }
@@ -542,7 +523,6 @@ smb_fdata1(netdissect_options *ndo,
 	case 'b':
 	  {
 	    unsigned int x;
-	    ND_TCHECK_1(buf);
 	    x = GET_U_1(buf);
 	    ND_PRINT("%u (0x%x)", x, x);
 	    buf += 1;
@@ -552,7 +532,6 @@ smb_fdata1(netdissect_options *ndo,
 	case 'd':
 	  {
 	    int x;
-	    ND_TCHECK_2(buf);
 	    x = reverse ? GET_BE_S_2(buf) :
 			  GET_LE_S_2(buf);
 	    ND_PRINT("%d (0x%x)", x, x);
@@ -563,7 +542,6 @@ smb_fdata1(netdissect_options *ndo,
 	case 'D':
 	  {
 	    int x;
-	    ND_TCHECK_4(buf);
 	    x = reverse ? GET_BE_S_4(buf) :
 			  GET_LE_S_4(buf);
 	    ND_PRINT("%d (0x%x)", x, x);
@@ -574,7 +552,6 @@ smb_fdata1(netdissect_options *ndo,
 	case 'L':
 	  {
 	    uint64_t x;
-	    ND_TCHECK_8(buf);
 	    x = reverse ? GET_BE_U_8(buf) :
 			  GET_LE_U_8(buf);
 	    ND_PRINT("%" PRIu64 " (0x%" PRIx64 ")", x, x);
@@ -585,7 +562,6 @@ smb_fdata1(netdissect_options *ndo,
 	case 'u':
 	  {
 	    unsigned int x;
-	    ND_TCHECK_2(buf);
 	    x = reverse ? GET_BE_U_2(buf) :
 			  GET_LE_U_2(buf);
 	    ND_PRINT("%u (0x%x)", x, x);
@@ -596,7 +572,6 @@ smb_fdata1(netdissect_options *ndo,
 	case 'U':
 	  {
 	    unsigned int x;
-	    ND_TCHECK_4(buf);
 	    x = reverse ? GET_BE_U_4(buf) :
 			  GET_LE_U_4(buf);
 	    ND_PRINT("%u (0x%x)", x, x);
@@ -623,7 +598,6 @@ smb_fdata1(netdissect_options *ndo,
 	case 'B':
 	  {
 	    unsigned int x;
-	    ND_TCHECK_1(buf);
 	    x = GET_U_1(buf);
 	    ND_PRINT("0x%X", x);
 	    buf += 1;
@@ -633,7 +607,6 @@ smb_fdata1(netdissect_options *ndo,
 	case 'w':
 	  {
 	    unsigned int x;
-	    ND_TCHECK_2(buf);
 	    x = reverse ? GET_BE_U_2(buf) :
 			  GET_LE_U_2(buf);
 	    ND_PRINT("0x%X", x);
@@ -644,7 +617,6 @@ smb_fdata1(netdissect_options *ndo,
 	case 'W':
 	  {
 	    unsigned int x;
-	    ND_TCHECK_4(buf);
 	    x = reverse ? GET_BE_U_4(buf) :
 			  GET_LE_U_4(buf);
 	    ND_PRINT("0x%X", x);
@@ -658,7 +630,6 @@ smb_fdata1(netdissect_options *ndo,
 	    switch (*fmt) {
 
 	    case 'b':
-		ND_TCHECK_1(buf);
 		stringlen = GET_U_1(buf);
 		stringlen_is_set = 1;
 		ND_PRINT("%u", stringlen);
@@ -667,7 +638,6 @@ smb_fdata1(netdissect_options *ndo,
 
 	    case 'd':
 	    case 'u':
-		ND_TCHECK_2(buf);
 		stringlen = reverse ? GET_BE_U_2(buf) :
 				      GET_LE_U_2(buf);
 		stringlen_is_set = 1;
@@ -677,7 +647,6 @@ smb_fdata1(netdissect_options *ndo,
 
 	    case 'D':
 	    case 'U':
-		ND_TCHECK_4(buf);
 		stringlen = reverse ? GET_BE_U_4(buf) :
 				      GET_LE_U_4(buf);
 		stringlen_is_set = 1;
@@ -692,35 +661,24 @@ smb_fdata1(netdissect_options *ndo,
 	case 'R':	/* like 'S', but always ASCII */
 	  {
 	    /*XXX unistr() */
-	    uint32_t len;
-	    int result;
-
-	    len = 0;
-	    result = unistr(ndo, &strbuf, buf, &len, 1, (*fmt == 'R') ? 0 : unicodestr);
+	    buf = unistr(ndo, &strbuf, buf, 0, 1, (*fmt == 'R') ? 0 : unicodestr);
 	    ND_PRINT("%s", strbuf);
-	    if (result == -1)
+	    if (buf == NULL)
 		goto trunc;
-	    buf += len;
 	    fmt++;
 	    break;
 	  }
 	case 'Z':
 	case 'Y':	/* like 'Z', but always ASCII */
 	  {
-	    uint32_t len;
-	    int result;
-
-	    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;
-	    result = unistr(ndo, &strbuf, buf + 1, &len, 1, (*fmt == 'Y') ? 0 : unicodestr);
+	    buf = unistr(ndo, &strbuf, buf + 1, 0, 1, (*fmt == 'Y') ? 0 : unicodestr);
 	    ND_PRINT("%s", strbuf);
-	    if (result == -1)
+	    if (buf == NULL)
 		goto trunc;
-	    buf += len + 1;
 	    fmt++;
 	    break;
 	  }
@@ -731,7 +689,7 @@ smb_fdata1(netdissect_options *ndo,
 	    ND_PRINT("%-*.*s", l, l, buf);
 	    buf += l;
 	    fmt++;
-	    while (isdigit((unsigned char)*fmt))
+	    while (ND_ASCII_ISDIGIT(*fmt))
 		fmt++;
 	    break;
 	  }
@@ -745,23 +703,20 @@ smb_fdata1(netdissect_options *ndo,
 	    ND_PRINT("%-*.*s", (int)stringlen, (int)stringlen, buf);
 	    buf += stringlen;
 	    fmt++;
-	    while (isdigit((unsigned char)*fmt))
+	    while (ND_ASCII_ISDIGIT(*fmt))
 		fmt++;
 	    break;
 	  }
 	case 'C':
 	  {
-	    int result;
-
             if (!stringlen_is_set) {
                 ND_PRINT("{stringlen not set}");
                 goto trunc;
             }
-	    result = unistr(ndo, &strbuf, buf, &stringlen, 0, unicodestr);
+	    buf = unistr(ndo, &strbuf, buf, stringlen, 0, unicodestr);
 	    ND_PRINT("%s", strbuf);
-	    if (result == -1)
+	    if (buf == NULL)
 		goto trunc;
-	    buf += stringlen;
 	    fmt++;
 	    break;
 	  }
@@ -774,7 +729,7 @@ smb_fdata1(netdissect_options *ndo,
 		buf++;
 	    }
 	    fmt++;
-	    while (isdigit((unsigned char)*fmt))
+	    while (ND_ASCII_ISDIGIT(*fmt))
 		fmt++;
 	    break;
 	  }
@@ -799,7 +754,6 @@ smb_fdata1(netdissect_options *ndo,
 		    name_type_str(name_type));
 		break;
 	    case 2:
-		ND_TCHECK_1(buf + 15);
 		name_type = GET_U_1(buf + 15);
 		ND_PRINT("%-15.15s NameType=0x%02X (%s)", buf, name_type,
 		    name_type_str(name_type));
@@ -807,20 +761,19 @@ smb_fdata1(netdissect_options *ndo,
 		break;
 	    }
 	    fmt++;
-	    while (isdigit((unsigned char)*fmt))
+	    while (ND_ASCII_ISDIGIT(*fmt))
 		fmt++;
 	    break;
 	  }
 	case 'T':
 	  {
 	    time_t t;
-	    struct tm *lt;
 	    const char *tstring;
+	    char buffer[sizeof("Www Mmm dd hh:mm:ss yyyyy")];
 	    uint32_t x;
 
 	    switch (atoi(fmt + 1)) {
 	    case 1:
-		ND_TCHECK_4(buf);
 		x = GET_LE_U_4(buf);
 		if (x == 0 || x == 0xFFFFFFFF)
 		    t = 0;
@@ -829,7 +782,6 @@ smb_fdata1(netdissect_options *ndo,
 		buf += 4;
 		break;
 	    case 2:
-		ND_TCHECK_4(buf);
 		x = GET_LE_U_4(buf);
 		if (x == 0 || x == 0xFFFFFFFF)
 		    t = 0;
@@ -847,16 +799,13 @@ smb_fdata1(netdissect_options *ndo,
 		break;
 	    }
 	    if (t != 0) {
-		lt = localtime(&t);
-		if (lt != NULL)
-		    tstring = asctime(lt);
-		else
-		    tstring = "(Can't convert time)\n";
+		    tstring = nd_format_time(buffer, sizeof(buffer), "%a %b %e %T %Y",
+		    localtime(&t));
 	    } else
-		tstring = "NULL\n";
-	    ND_PRINT("%s", tstring);
+		tstring = "NULL";
+	    ND_PRINT("%s\n", tstring);
 	    fmt++;
-	    while (isdigit((unsigned char)*fmt))
+	    while (ND_ASCII_ISDIGIT(*fmt))
 		fmt++;
 	    break;
 	  }
@@ -889,11 +838,26 @@ smb_fdata(netdissect_options *ndo,
     while (*fmt) {
 	switch (*fmt) {
 	case '*':
+	    /*
+	     * List of multiple instances of something described by the
+	     * remainder of the string (which may itself include a list
+	     * of multiple instances of something, so we recurse).
+	     */
 	    fmt++;
 	    while (buf < maxbuf) {
 		const u_char *buf2;
 		depth++;
-		buf2 = smb_fdata(ndo, buf, fmt, maxbuf, unicodestr);
+		/*
+		 * In order to avoid stack exhaustion recurse at most 10
+		 * levels; that "should not happen", as no SMB structure
+		 * should be nested *that* deeply, and we thus shouldn't
+		 * have format strings with that level of nesting.
+		 */
+		if (depth == 10) {
+			ND_PRINT("(too many nested levels, not recursing)");
+			buf2 = buf;
+		} else
+			buf2 = smb_fdata(ndo, buf, fmt, maxbuf, unicodestr);
 		depth--;
 		if (buf2 == NULL)
 		    return(NULL);
@@ -904,22 +868,35 @@ smb_fdata(netdissect_options *ndo,
 	    return(buf);
 
 	case '|':
+	    /*
+	     * Just do a bounds check.
+	     */
 	    fmt++;
 	    if (buf >= maxbuf)
 		return(buf);
 	    break;
 
 	case '%':
+	    /*
+	     * XXX - unused?
+	     */
 	    fmt++;
 	    buf = maxbuf;
 	    break;
 
 	case '#':
+	    /*
+	     * Done?
+	     */
 	    fmt++;
 	    return(buf);
 	    break;
 
 	case '[':
+	    /*
+	     * Format of an item, enclosed in square brackets; dissect
+	     * the item with smb_fdata1().
+	     */
 	    fmt++;
 	    if (buf >= maxbuf)
 		return(buf);
@@ -947,6 +924,9 @@ smb_fdata(netdissect_options *ndo,
 	    break;
 
 	default:
+	    /*
+	     * Not a formatting character, so just print it.
+	     */
 	    ND_PRINT("%c", *fmt);
 	    fmt++;
 	    break;
@@ -1092,17 +1072,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);
 }
 
@@ -1983,6 +1963,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;
 }