X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/fb298cf2dd1b14c3857c42ab0e26d883fe4a6f4c..refs/heads/tcpdump-4.9:/smbutil.c diff --git a/smbutil.c b/smbutil.c index 1af60106..525635cb 100644 --- a/smbutil.c +++ b/smbutil.c @@ -1,757 +1,1927 @@ -/* - Copyright (C) Andrew Tridgell 1995-1999 - - This software may be distributed either under the terms of the - BSD-style license that accompanies tcpdump or the GNU GPL version 2 - or later */ +/* + * Copyright (C) Andrew Tridgell 1995-1999 + * + * This software may be distributed either under the terms of the + * BSD-style license that accompanies tcpdump or the GNU GPL version 2 + * or later + */ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/smbutil.c,v 1.12 2000-12-04 00:35:45 guy Exp $"; -#endif - -#include -#include -#include -#include - +#include -#include - -#include #include #include #include -#include -#include "interface.h" +#include "netdissect.h" +#include "extract.h" #include "smb.h" -extern const uchar *startbuf; +static uint32_t stringlen; +extern const u_char *startbuf; -/******************************************************************* - interpret a 32 bit dos packed date/time to some parameters -********************************************************************/ -static void interpret_dos_date(uint32 date,int *year,int *month,int *day,int *hour,int *minute,int *second) +/* + * interpret a 32 bit dos packed date/time to some parameters + */ +static void +interpret_dos_date(uint32_t date, struct tm *tp) { - uint32 p0,p1,p2,p3; - - p0=date&0xFF; p1=((date&0xFF00)>>8)&0xFF; - p2=((date&0xFF0000)>>16)&0xFF; p3=((date&0xFF000000)>>24)&0xFF; - - *second = 2*(p0 & 0x1F); - *minute = ((p0>>5)&0xFF) + ((p1&0x7)<<3); - *hour = (p1>>3)&0xFF; - *day = (p2&0x1F); - *month = ((p2>>5)&0xFF) + ((p3&0x1)<<3) - 1; - *year = ((p3>>1)&0xFF) + 80; + uint32_t p0, p1, p2, p3; + + p0 = date & 0xFF; + p1 = ((date & 0xFF00) >> 8) & 0xFF; + p2 = ((date & 0xFF0000) >> 16) & 0xFF; + p3 = ((date & 0xFF000000) >> 24) & 0xFF; + + tp->tm_sec = 2 * (p0 & 0x1F); + tp->tm_min = ((p0 >> 5) & 0xFF) + ((p1 & 0x7) << 3); + tp->tm_hour = (p1 >> 3) & 0xFF; + tp->tm_mday = (p2 & 0x1F); + tp->tm_mon = ((p2 >> 5) & 0xFF) + ((p3 & 0x1) << 3) - 1; + tp->tm_year = ((p3 >> 1) & 0xFF) + 80; } -/******************************************************************* - create a unix date from a dos date -********************************************************************/ -static time_t make_unix_date(const void *date_ptr) +/* + * common portion: + * create a unix date from a dos date + */ +static time_t +int_unix_date(uint32_t dos_date) { - uint32 dos_date=0; - struct tm t; + struct tm t; - dos_date = IVAL(date_ptr,0); + if (dos_date == 0) + return(0); - if (dos_date == 0) return(0); - - interpret_dos_date(dos_date,&t.tm_year,&t.tm_mon, - &t.tm_mday,&t.tm_hour,&t.tm_min,&t.tm_sec); - t.tm_wday = 1; - t.tm_yday = 1; - t.tm_isdst = 0; + interpret_dos_date(dos_date, &t); + t.tm_wday = 1; + t.tm_yday = 1; + t.tm_isdst = 0; - return (mktime(&t)); + return (mktime(&t)); } -/******************************************************************* - create a unix date from a dos date -********************************************************************/ -static time_t make_unix_date2(const void *date_ptr) +/* + * create a unix date from a dos date + * in network byte order + */ +static time_t +make_unix_date(const u_char *date_ptr) { - uint32 x,x2; + uint32_t dos_date = 0; - x = IVAL(date_ptr,0); - x2 = ((x&0xFFFF)<<16) | ((x&0xFFFF0000)>>16); - SIVAL(&x,0,x2); + dos_date = EXTRACT_LE_32BITS(date_ptr); - return(make_unix_date((void *)&x)); + return int_unix_date(dos_date); } -/**************************************************************************** -interpret an 8 byte "filetime" structure to a time_t -It's originally in "100ns units since jan 1st 1601" -****************************************************************************/ -static time_t interpret_long_date(const char *p) +/* + * create a unix date from a dos date + * in halfword-swapped network byte order! + */ +static time_t +make_unix_date2(const u_char *date_ptr) { - double d; - time_t ret; + uint32_t x, x2; - /* this gives us seconds since jan 1st 1601 (approx) */ - d = (IVAL(p,4)*256.0 + CVAL(p,3)) * (1.0e-7 * (1<<24)); - - /* now adjust by 369 years to make the secs since 1970 */ - d -= 369.0*365.25*24*60*60; + x = EXTRACT_LE_32BITS(date_ptr); + x2 = ((x & 0xFFFF) << 16) | ((x & 0xFFFF0000) >> 16); + return int_unix_date(x2); +} - /* and a fudge factor as we got it wrong by a few days */ - d += (3*24*60*60 + 6*60*60 + 2); +/* + * interpret an 8 byte "filetime" structure to a time_t + * It's originally in "100ns units since jan 1st 1601" + */ +static time_t +interpret_long_date(const u_char *p) +{ + double d; + time_t ret; - if (d<0) - return(0); + /* this gives us seconds since jan 1st 1601 (approx) */ + d = (EXTRACT_LE_32BITS(p + 4) * 256.0 + p[3]) * (1.0e-7 * (1 << 24)); - ret = (time_t)d; + /* now adjust by 369 years to make the secs since 1970 */ + d -= 369.0 * 365.25 * 24 * 60 * 60; - return(ret); -} + /* and a fudge factor as we got it wrong by a few days */ + d += (3 * 24 * 60 * 60 + 6 * 60 * 60 + 2); + if (d < 0) + return(0); -/**************************************************************************** -interpret the weird netbios "name". Return the name type, or -1 if -we run past the end of the buffer -****************************************************************************/ -static int name_interpret(const uchar *in,const uchar *maxbuf,char *out) -{ - int ret; - int len; - - if (in >= maxbuf) - return(-1); /* name goes past the end of the buffer */ - TCHECK2(*in, 1); - len = (*in++) / 2; + ret = (time_t)d; - *out=0; + return(ret); +} - if (len > 30 || len<1) return(0); +/* + * interpret the weird netbios "name". Return the name type, or -1 if + * we run past the end of the buffer + */ +static int +name_interpret(netdissect_options *ndo, + const u_char *in, const u_char *maxbuf, char *out) +{ + int ret; + int len; - while (len--) - { - if (in + 1 >= maxbuf) + if (in >= maxbuf) return(-1); /* name goes past the end of the buffer */ - TCHECK2(*in, 2); - if (in[0] < 'A' || in[0] > 'P' || in[1] < 'A' || in[1] > 'P') { - *out = 0; + ND_TCHECK2(*in, 1); + len = (*in++) / 2; + + *out=0; + + if (len > 30 || len < 1) return(0); - } - *out = ((in[0]-'A')<<4) + (in[1]-'A'); - in += 2; - out++; + + while (len--) { + ND_TCHECK2(*in, 2); + if (in + 1 >= maxbuf) + return(-1); /* name goes past the end of the buffer */ + if (in[0] < 'A' || in[0] > 'P' || in[1] < 'A' || in[1] > 'P') { + *out = 0; + return(0); + } + *out = ((in[0] - 'A') << 4) + (in[1] - 'A'); + in += 2; + out++; } - *out = 0; - ret = out[-1]; + *out = 0; + ret = out[-1]; - return(ret); + return(ret); trunc: - return(-1); + return(-1); } -/**************************************************************************** -find a pointer to a netbios name -****************************************************************************/ -static const uchar *name_ptr(const uchar *buf,int ofs,const uchar *maxbuf) +/* + * find a pointer to a netbios name + */ +static const u_char * +name_ptr(netdissect_options *ndo, + const u_char *buf, int ofs, const u_char *maxbuf) { - const uchar *p; - uchar c; + const u_char *p; + u_char c; - p = buf+ofs; - if (p >= maxbuf) - return(NULL); /* name goes past the end of the buffer */ - TCHECK2(*p, 1); - - c = *p; - - /* XXX - this should use the same code that the DNS dissector does */ - if ((c & 0xC0) == 0xC0) - { - uint16 l = RSVAL(buf, ofs) & 0x3FFF; - if (l == 0) - { - /* We have a pointer that points to itself. */ - return(NULL); - } - p = buf + l; - if (p >= maxbuf) + p = buf + ofs; + if (p >= maxbuf) return(NULL); /* name goes past the end of the buffer */ - TCHECK2(*p, 1); - return(buf + l); + ND_TCHECK2(*p, 1); + + c = *p; + + /* XXX - this should use the same code that the DNS dissector does */ + if ((c & 0xC0) == 0xC0) { + uint16_t l; + + ND_TCHECK2(*p, 2); + if ((p + 1) >= maxbuf) + return(NULL); /* name goes past the end of the buffer */ + l = EXTRACT_16BITS(p) & 0x3FFF; + if (l == 0) { + /* We have a pointer that points to itself. */ + return(NULL); + } + p = buf + l; + if (p >= maxbuf) + return(NULL); /* name goes past the end of the buffer */ + ND_TCHECK2(*p, 1); } - else - return(buf+ofs); + return(p); trunc: - return(NULL); /* name goes past the end of the buffer */ -} + return(NULL); /* name goes past the end of the buffer */ +} -/**************************************************************************** -extract a netbios name from a buf -****************************************************************************/ -static int name_extract(const uchar *buf,int ofs,const uchar *maxbuf,char *name) +/* + * extract a netbios name from a buf + */ +static int +name_extract(netdissect_options *ndo, + const u_char *buf, int ofs, const u_char *maxbuf, char *name) { - const uchar *p = name_ptr(buf,ofs,maxbuf); - if (p == NULL) - return(-1); /* error (probably name going past end of buffer) */ - strcpy(name,""); - return(name_interpret(p,maxbuf,name)); -} - - -/**************************************************************************** -return the total storage length of a mangled name -****************************************************************************/ -static int name_len(const unsigned char *s, const unsigned char *maxbuf) + const u_char *p = name_ptr(ndo, buf, ofs, maxbuf); + if (p == NULL) + return(-1); /* error (probably name going past end of buffer) */ + name[0] = '\0'; + return(name_interpret(ndo, p, maxbuf, name)); +} + + +/* + * return the total storage length of a mangled name + */ +static int +name_len(netdissect_options *ndo, + const unsigned char *s, const unsigned char *maxbuf) { - const unsigned char *s0 = s; - unsigned char c; + const unsigned char *s0 = s; + unsigned char c; - if (s >= maxbuf) - return(-1); /* name goes past the end of the buffer */ - TCHECK2(*s, 1); - c = *s; - if ((c & 0xC0) == 0xC0) - return(2); - while (*s) - { - if (s >= maxbuf) + if (s >= maxbuf) return(-1); /* name goes past the end of the buffer */ - TCHECK2(*s, 1); - s += (*s)+1; + ND_TCHECK2(*s, 1); + c = *s; + if ((c & 0xC0) == 0xC0) + return(2); + while (*s) { + if (s >= maxbuf) + return(-1); /* name goes past the end of the buffer */ + ND_TCHECK2(*s, 1); + s += (*s) + 1; + ND_TCHECK2(*s, 1); } - return(PTR_DIFF(s,s0)+1); + return(PTR_DIFF(s, s0) + 1); trunc: - return(-1); /* name goes past the end of the buffer */ + return(-1); /* name goes past the end of the buffer */ } -static void print_asc(const unsigned char *buf,int len) +static void +print_asc(netdissect_options *ndo, + const unsigned char *buf, int len) { - int i; - for (i=0;i8) + ND_PRINT((ndo, " ")); + while (n--) + ND_PRINT((ndo, " ")); + + n = min(8, i % 16); + print_asc(ndo, &buf[i - (i % 16)], n); + ND_PRINT((ndo, " ")); + n = (i % 16) - n; + if (n > 0) + print_asc(ndo, &buf[i - n], n); + ND_PRINT((ndo, "\n")); } - } - if (i%16) { - int n; - - n = 16 - (i%16); - printf(" "); - if (n>8) printf(" "); - while (n--) printf(" "); - - n = MIN(8,i%16); - print_asc(&buf[i-(i%16)],n); printf(" "); - n = (i%16) - n; - if (n>0) print_asc(&buf[i-n],n); - printf("\n"); - } + return; + +trunc: + ND_PRINT((ndo, "\n")); + ND_PRINT((ndo, "WARNING: Short packet. Try increasing the snap length\n")); } -static void write_bits(unsigned int val,char *fmt) +static void +write_bits(netdissect_options *ndo, + unsigned int val, const char *fmt) { - char *p = fmt; - int i=0; - - while ((p=strchr(fmt,'|'))) { - int l = PTR_DIFF(p,fmt); - if (l && (val & (1<= MAX_UNISTR_SIZE) + break; + if (ND_ISPRINT(s[0])) + buf[l] = s[0]; + else { + if (s[0] == 0) + break; + buf[l] = '.'; + } + l++; + s++; + strsize--; } - - while (l < (sizeof(buf)-1) && s[0] && s[1] == 0) { + } else { + while (strsize != 0) { + ND_TCHECK2(s[0], 2); + if (l >= MAX_UNISTR_SIZE) + break; + if (s[1] == 0 && ND_ISPRINT(s[0])) { + /* It's a printable ASCII character */ buf[l] = s[0]; - s += 2; l++; - *len += 2; + } else { + /* It's a non-ASCII character or a non-printable ASCII character */ + if (s[0] == 0 && s[1] == 0) + break; + buf[l] = '.'; + } + l++; + s += 2; + if (strsize == 1) + break; + strsize -= 2; } - buf[l] = 0; - *len += 2; - return buf; + } + buf[l] = 0; + return buf; + +trunc: + return NULL; } -static const uchar *fdata1(const uchar *buf, const char *fmt, const uchar *maxbuf) +static const u_char * +smb_fdata1(netdissect_options *ndo, + const u_char *buf, const char *fmt, const u_char *maxbuf, + int unicodestr) { - int reverse=0; - char *attrib_fmt = "READONLY|HIDDEN|SYSTEM|VOLUME|DIR|ARCHIVE|"; - int len; - - while (*fmt && buf sizeof(bitfmt) - 1) + l = sizeof(bitfmt)-1; + + strncpy(bitfmt, fmt, l); + bitfmt[l] = '\0'; + fmt = p + 1; + ND_TCHECK(buf[0]); + write_bits(ndo, buf[0], bitfmt); + buf++; + break; + } + + case 'P': + { + int l = atoi(fmt + 1); + if(l <= 0) goto trunc; /* actually error in fmt string */ + ND_TCHECK2(buf[0], l); + buf += l; + fmt++; + while (isdigit((unsigned char)*fmt)) fmt++; - break; - } - case 'Z': - { - if (*buf != 4 && *buf != 2) - printf("Error! ASCIIZ buffer of type %d (safety=%d)\n", - *buf,(int)PTR_DIFF(maxbuf,buf)); - printf("%.*s",(int)PTR_DIFF(maxbuf,buf+1),unistr(buf+1, &len)); - buf += len+1; - fmt++; - break; - } - case 's': - { - int l = atoi(fmt+1); - printf("%-*.*s",l,l,buf); - buf += l; - fmt++; while (isdigit(*fmt)) fmt++; - break; - } - case 'h': - { - int l = atoi(fmt+1); - while (l--) printf("%02x",*buf++); - fmt++; while (isdigit(*fmt)) fmt++; - break; - } - case 'n': - { - int t = atoi(fmt+1); - char nbuf[255]; - int name_type; - int len; - switch (t) { - case 1: - name_type = name_extract(startbuf,PTR_DIFF(buf,startbuf),maxbuf, - nbuf); - if (name_type < 0) - goto trunc; - len = name_len(buf,maxbuf); - if (len < 0) - goto trunc; - buf += len; - printf("%-15.15s NameType=0x%02X (%s)", - nbuf,name_type,name_type_str(name_type)); - break; - case 2: - name_type = buf[15]; - printf("%-15.15s NameType=0x%02X (%s)", - buf,name_type,name_type_str(name_type)); - buf += 16; - break; - } - fmt++; while (isdigit(*fmt)) fmt++; - break; - } - case 'T': - { - time_t t; - int x = IVAL(buf,0); - switch (atoi(fmt+1)) { - case 1: - if (x==0 || x==-1 || x==0xFFFFFFFF) - t = 0; - else - t = make_unix_date(buf); - buf+=4; - break; - case 2: - if (x==0 || x==-1 || x==0xFFFFFFFF) - t = 0; - else - t = make_unix_date2(buf); - buf+=4; - break; - case 3: - t = interpret_long_date(buf); - buf+=8; - break; + break; + } + case 'r': + reverse = !reverse; + fmt++; + break; + case 'b': + { + unsigned int x; + ND_TCHECK(buf[0]); + x = buf[0]; + ND_PRINT((ndo, "%u (0x%x)", x, x)); + buf += 1; + fmt++; + break; + } + case 'd': + { + unsigned int x; + ND_TCHECK2(buf[0], 2); + x = reverse ? EXTRACT_16BITS(buf) : + EXTRACT_LE_16BITS(buf); + ND_PRINT((ndo, "%d (0x%x)", x, x)); + buf += 2; + fmt++; + break; + } + case 'D': + { + unsigned int x; + ND_TCHECK2(buf[0], 4); + x = reverse ? EXTRACT_32BITS(buf) : + EXTRACT_LE_32BITS(buf); + ND_PRINT((ndo, "%d (0x%x)", x, x)); + buf += 4; + fmt++; + break; + } + case 'L': + { + uint64_t x; + ND_TCHECK2(buf[0], 8); + x = reverse ? EXTRACT_64BITS(buf) : + EXTRACT_LE_64BITS(buf); + ND_PRINT((ndo, "%" PRIu64 " (0x%" PRIx64 ")", x, x)); + buf += 8; + fmt++; + break; + } + case 'M': + { + /* Weird mixed-endian length values in 64-bit locks */ + uint32_t x1, x2; + uint64_t x; + ND_TCHECK2(buf[0], 8); + x1 = reverse ? EXTRACT_32BITS(buf) : + EXTRACT_LE_32BITS(buf); + x2 = reverse ? EXTRACT_32BITS(buf + 4) : + EXTRACT_LE_32BITS(buf + 4); + x = (((uint64_t)x1) << 32) | x2; + ND_PRINT((ndo, "%" PRIu64 " (0x%" PRIx64 ")", x, x)); + buf += 8; + fmt++; + break; + } + case 'B': + { + unsigned int x; + ND_TCHECK(buf[0]); + x = buf[0]; + ND_PRINT((ndo, "0x%X", x)); + buf += 1; + fmt++; + break; + } + case 'w': + { + unsigned int x; + ND_TCHECK2(buf[0], 2); + x = reverse ? EXTRACT_16BITS(buf) : + EXTRACT_LE_16BITS(buf); + ND_PRINT((ndo, "0x%X", x)); + buf += 2; + fmt++; + break; + } + case 'W': + { + unsigned int x; + ND_TCHECK2(buf[0], 4); + x = reverse ? EXTRACT_32BITS(buf) : + EXTRACT_LE_32BITS(buf); + ND_PRINT((ndo, "0x%X", x)); + buf += 4; + fmt++; + break; + } + case 'l': + { + fmt++; + switch (*fmt) { + + case 'b': + ND_TCHECK(buf[0]); + stringlen = buf[0]; + ND_PRINT((ndo, "%u", stringlen)); + buf += 1; + break; + + case 'd': + ND_TCHECK2(buf[0], 2); + stringlen = reverse ? EXTRACT_16BITS(buf) : + EXTRACT_LE_16BITS(buf); + ND_PRINT((ndo, "%u", stringlen)); + buf += 2; + break; + + case 'D': + ND_TCHECK2(buf[0], 4); + stringlen = reverse ? EXTRACT_32BITS(buf) : + EXTRACT_LE_32BITS(buf); + ND_PRINT((ndo, "%u", stringlen)); + buf += 4; + break; + } + fmt++; + break; + } + case 'S': + case 'R': /* like 'S', but always ASCII */ + { + /*XXX unistr() */ + const char *s; + uint32_t len; + + len = 0; + s = unistr(ndo, buf, &len, (*fmt == 'R') ? 0 : unicodestr); + if (s == NULL) + goto trunc; + ND_PRINT((ndo, "%s", s)); + buf += len; + fmt++; + break; + } + case 'Z': + case 'Y': /* like 'Z', but always ASCII */ + { + const char *s; + uint32_t len; + + ND_TCHECK(*buf); + if (*buf != 4 && *buf != 2) { + ND_PRINT((ndo, "Error! ASCIIZ buffer of type %u", *buf)); + return maxbuf; /* give up */ + } + len = 0; + s = unistr(ndo, buf + 1, &len, (*fmt == 'Y') ? 0 : unicodestr); + if (s == NULL) + goto trunc; + ND_PRINT((ndo, "%s", s)); + buf += len + 1; + fmt++; + break; + } + case 's': + { + int l = atoi(fmt + 1); + ND_TCHECK2(*buf, l); + ND_PRINT((ndo, "%-*.*s", l, l, buf)); + buf += l; + fmt++; + while (isdigit((unsigned char)*fmt)) + fmt++; + break; + } + case 'c': + { + ND_TCHECK2(*buf, stringlen); + ND_PRINT((ndo, "%-*.*s", (int)stringlen, (int)stringlen, buf)); + buf += stringlen; + fmt++; + while (isdigit((unsigned char)*fmt)) + fmt++; + break; + } + case 'C': + { + const char *s; + s = unistr(ndo, buf, &stringlen, unicodestr); + if (s == NULL) + goto trunc; + ND_PRINT((ndo, "%s", s)); + buf += stringlen; + fmt++; + break; + } + case 'h': + { + int l = atoi(fmt + 1); + ND_TCHECK2(*buf, l); + while (l--) + ND_PRINT((ndo, "%02x", *buf++)); + fmt++; + while (isdigit((unsigned char)*fmt)) + fmt++; + break; + } + case 'n': + { + int t = atoi(fmt+1); + char nbuf[255]; + int name_type; + int len; + + switch (t) { + case 1: + name_type = name_extract(ndo, startbuf, PTR_DIFF(buf, startbuf), + maxbuf, nbuf); + if (name_type < 0) + goto trunc; + len = name_len(ndo, buf, maxbuf); + if (len < 0) + goto trunc; + buf += len; + ND_PRINT((ndo, "%-15.15s NameType=0x%02X (%s)", nbuf, name_type, + name_type_str(name_type))); + break; + case 2: + ND_TCHECK(buf[15]); + name_type = buf[15]; + ND_PRINT((ndo, "%-15.15s NameType=0x%02X (%s)", buf, name_type, + name_type_str(name_type))); + buf += 16; + break; + } + fmt++; + while (isdigit((unsigned char)*fmt)) + fmt++; + break; + } + case 'T': + { + time_t t; + struct tm *lt; + const char *tstring; + uint32_t x; + + switch (atoi(fmt + 1)) { + case 1: + ND_TCHECK2(buf[0], 4); + x = EXTRACT_LE_32BITS(buf); + if (x == 0 || x == 0xFFFFFFFF) + t = 0; + else + t = make_unix_date(buf); + buf += 4; + break; + case 2: + ND_TCHECK2(buf[0], 4); + x = EXTRACT_LE_32BITS(buf); + if (x == 0 || x == 0xFFFFFFFF) + t = 0; + else + t = make_unix_date2(buf); + buf += 4; + break; + case 3: + ND_TCHECK2(buf[0], 8); + t = interpret_long_date(buf); + buf += 8; + break; + default: + t = 0; + break; + } + if (t != 0) { + lt = localtime(&t); + if (lt != NULL) + tstring = asctime(lt); + else + tstring = "(Can't convert time)\n"; + } else + tstring = "NULL\n"; + ND_PRINT((ndo, "%s", tstring)); + fmt++; + while (isdigit((unsigned char)*fmt)) + fmt++; + break; + } + default: + ND_PRINT((ndo, "%c", *fmt)); + fmt++; + break; } - printf("%s",t?asctime(localtime(&t)):"NULL\n"); - fmt++; while (isdigit(*fmt)) fmt++; - break; - } - default: - putchar(*fmt); - fmt++; - break; } - } - if (buf>=maxbuf && *fmt) - printf("END OF BUFFER\n"); + if (buf >= maxbuf && *fmt) + ND_PRINT((ndo, "END OF BUFFER\n")); - return(buf); + return(buf); trunc: - printf("\n"); - printf("WARNING: Short packet. Try increasing the snap length\n"); - return(NULL); + ND_PRINT((ndo, "\n")); + ND_PRINT((ndo, "WARNING: Short packet. Try increasing the snap length\n")); + return(NULL); } -const uchar *fdata(const uchar *buf, const char *fmt, const uchar *maxbuf) +const u_char * +smb_fdata(netdissect_options *ndo, + const u_char *buf, const char *fmt, const u_char *maxbuf, + int unicodestr) { - static int depth=0; - char s[128]; - char *p; - - while (*fmt) { - switch (*fmt) { - case '*': - fmt++; - while (buf < maxbuf) { - const uchar *buf2; - depth++; - buf2 = fdata(buf,fmt,maxbuf); - depth--; - if (buf2 == buf) return(buf); - buf = buf2; - } - break; - - case '|': - fmt++; - if (buf>=maxbuf) return(buf); - break; - - case '%': - fmt++; - buf=maxbuf; - break; - - case '#': - fmt++; - return(buf); - break; - - case '[': - fmt++; - if (buf>=maxbuf) return(buf); - memset(s, 0, sizeof(s)); - p = strchr(fmt,']'); - strncpy(s,fmt,p-fmt); - fmt = p+1; - buf = fdata1(buf,s,maxbuf); - if (buf == NULL) - return(NULL); - break; - - default: - putchar(*fmt); fmt++; - fflush(stdout); - break; + static int depth = 0; + const u_char *buf_start = buf; + char s[128]; + char *p; + + 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++; + /* + * 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((ndo, "(too many nested levels, not recursing)")); + buf2 = buf; + } else + buf2 = smb_fdata(ndo, buf, fmt, maxbuf, unicodestr); + depth--; + if (buf2 == NULL) + return(NULL); + if (buf2 == buf) + return(buf); + buf = buf2; + } + 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); + memset(s, 0, sizeof(s)); + p = strchr(fmt, ']'); + if ((size_t)(p - fmt + 1) > sizeof(s)) { + /* overrun */ + return(buf); + } + strncpy(s, fmt, p - fmt); + s[p - fmt] = '\0'; + fmt = p + 1; + buf = smb_fdata1(ndo, buf, s, maxbuf, unicodestr); + if(buf < buf_start || buf == NULL) { + return(NULL); + } + break; + + default: + /* + * Not a formatting character, so just print it. + */ + ND_PRINT((ndo, "%c", *fmt)); + fmt++; + break; + } } - } - if (!depth && buf