The Tcpdump Group git mirrors - tcpdump/blobdiff

index dc072e1ff9c2123f52792533f000723be18ca377..7538a49c3ca2944ccfcdaf9aa32fe221622a8946 100644 (file)

--- a/tcpdump.c

+++ b/tcpdump.c

#endif

/* Capsicum-specific code requires macros from <net/bpf.h>, which will fail

* to compile if <pcap.h> has already been included; including the headers

#endif

/* Capsicum-specific code requires macros from <net/bpf.h>, which will fail

* to compile if <pcap.h> has already been included; including the headers

- * in the opposite order works fine.

+ * in the opposite order works fine. For the most part anyway, because in

+ * FreeBSD <pcap/pcap.h> declares bpf_dump() instead of <net/bpf.h>. Thus

+ * interface.h takes care of it later to avoid a compiler warning.

#ifdef HAVE_CAPSICUM

#include <sys/capsicum.h>

#ifdef HAVE_CAPSICUM

#include <sys/capsicum.h>

@@ -689,6 +691,7 @@ show_remote_devices_and_exit(void)

#define OPTION_TSTAMP_NANO 134

#define OPTION_FP_TYPE 135

#define OPTION_COUNT 136

#define OPTION_TSTAMP_NANO 134

#define OPTION_FP_TYPE 135

#define OPTION_COUNT 136

+#define OPTION_PRINT_SAMPLING 137

static const struct option longopts[] = {

#if defined(HAVE_PCAP_CREATE) || defined(_WIN32)

static const struct option longopts[] = {

#if defined(HAVE_PCAP_CREATE) || defined(_WIN32)

@@ -736,6 +739,7 @@ static const struct option longopts[] = {

{ "fp-type", no_argument, NULL, OPTION_FP_TYPE },

{ "number", no_argument, NULL, '#' },

{ "print", no_argument, NULL, OPTION_PRINT },

{ "fp-type", no_argument, NULL, OPTION_FP_TYPE },

{ "number", no_argument, NULL, '#' },

{ "print", no_argument, NULL, OPTION_PRINT },

+ { "print-sampling", required_argument, NULL, OPTION_PRINT_SAMPLING },

{ "version", no_argument, NULL, OPTION_VERSION },

{ NULL, 0, NULL, 0 }

};

{ "version", no_argument, NULL, OPTION_VERSION },

{ NULL, 0, NULL, 0 }

};

@@ -829,6 +833,8 @@ MakeFilename(char *buffer, char *orig_name, int cnt, int max_chars)

char *filename = malloc(PATH_MAX + 1);

if (filename == NULL)

error("%s: malloc", __func__);

char *filename = malloc(PATH_MAX + 1);

if (filename == NULL)

error("%s: malloc", __func__);

+ if (strlen(orig_name) == 0)

+ error("an empty string is not a valid file name");

/* Process with strftime if Gflag is set. */

if (Gflag != 0) {

/* Process with strftime if Gflag is set. */

if (Gflag != 0) {

@@ -840,9 +846,25 @@ MakeFilename(char *buffer, char *orig_name, int cnt, int max_chars)

}

/* There's no good way to detect an error in strftime since a return

}

/* There's no good way to detect an error in strftime since a return

- * value of 0 isn't necessarily failure.

+ * value of 0 isn't necessarily failure; if orig_name is an empty

+ * string, the formatted string will be empty.

+ *

+ * However, the C90 standard says that, if there *is* a

+ * buffer overflow, the content of the buffer is undefined,

+ * so we must check for a buffer overflow.

+ *

+ * So we check above for an empty orig_name, and only call

+ * strftime() if it's non-empty, in which case the return

+ * value will only be 0 if the formatted date doesn't fit

+ * in the buffer.

+ *

+ * (We check above because, even if we don't use -G, we

+ * want a better error message than "tcpdump: : No such

+ * file or directory" for this case.)

- strftime(filename, PATH_MAX, orig_name, local_tm);

+ if (strftime(filename, PATH_MAX, orig_name, local_tm) == 0) {

+ error("%s: strftime", __func__);

+ }

} else {

strncpy(filename, orig_name, PATH_MAX);

}

} else {

strncpy(filename, orig_name, PATH_MAX);

}

@@ -1862,6 +1884,8 @@ main(int argc, char **argv)

ndo->ndo_packettype = PT_SOMEIP;

else if (ascii_strcasecmp(optarg, "domain") == 0)

ndo->ndo_packettype = PT_DOMAIN;

ndo->ndo_packettype = PT_SOMEIP;

else if (ascii_strcasecmp(optarg, "domain") == 0)

ndo->ndo_packettype = PT_DOMAIN;

+ else if (ascii_strcasecmp(optarg, "quic") == 0)

+ ndo->ndo_packettype = PT_QUIC;

else

error("unknown packet type `%s'", optarg);

break;

else

error("unknown packet type `%s'", optarg);

break;

@@ -1956,6 +1980,14 @@ main(int argc, char **argv)

print = 1;

break;

print = 1;

break;

+ case OPTION_PRINT_SAMPLING:

+ print = 1;

+ ++ndo->ndo_Sflag;

+ ndo->ndo_print_sampling = atoi(optarg);

+ if (ndo->ndo_print_sampling <= 0)

+ error("invalid print sampling %s", optarg);

+ break;

#ifdef HAVE_PCAP_SET_TSTAMP_PRECISION

case OPTION_TSTAMP_MICRO:

ndo->ndo_tstamp_precision = PCAP_TSTAMP_PRECISION_MICRO;

#ifdef HAVE_PCAP_SET_TSTAMP_PRECISION

case OPTION_TSTAMP_MICRO:

ndo->ndo_tstamp_precision = PCAP_TSTAMP_PRECISION_MICRO;

@@ -2427,17 +2459,44 @@ DIAG_ON_ASSIGN_ENUM

#endif

if (Cflag != 0 || Gflag != 0) {

#ifdef HAVE_CAPSICUM

#endif

if (Cflag != 0 || Gflag != 0) {

#ifdef HAVE_CAPSICUM

- dumpinfo.WFileName = strdup(basename(WFileName));

+ /*

+ * basename() and dirname() may modify their input buffer

+ * and they do since FreeBSD 12.0, but they didn't before.

+ * Hence use the return value only, but always assume the

+ * input buffer has been modified and would need to be

+ * reset before the next use.

+ */

+ char *WFileName_copy;

+ if ((WFileName_copy = strdup(WFileName)) == NULL) {

+ error("Unable to allocate memory for file %s",

+ WFileName);

+ }

+ DIAG_OFF_C11_EXTENSIONS

+ dumpinfo.WFileName = strdup(basename(WFileName_copy));

+ DIAG_ON_C11_EXTENSIONS

if (dumpinfo.WFileName == NULL) {

error("Unable to allocate memory for file %s",

WFileName);

}

if (dumpinfo.WFileName == NULL) {

error("Unable to allocate memory for file %s",

WFileName);

}

- dumpinfo.dirfd = open(dirname(WFileName),

+ free(WFileName_copy);

+ if ((WFileName_copy = strdup(WFileName)) == NULL) {

+ error("Unable to allocate memory for file %s",

+ WFileName);

+ }

+ DIAG_OFF_C11_EXTENSIONS

+ char *WFileName_dirname = dirname(WFileName_copy);

+ DIAG_ON_C11_EXTENSIONS

+ dumpinfo.dirfd = open(WFileName_dirname,

O_DIRECTORY | O_RDONLY);

if (dumpinfo.dirfd < 0) {

error("unable to open directory %s",

O_DIRECTORY | O_RDONLY);

if (dumpinfo.dirfd < 0) {

error("unable to open directory %s",

- dirname(WFileName));

+ WFileName_dirname);

}

+ free(WFileName_dirname);

+ free(WFileName_copy);

cap_rights_init(&rights, CAP_CREATE, CAP_FCNTL,

CAP_FTRUNCATE, CAP_LOOKUP, CAP_SEEK, CAP_WRITE);

if (cap_rights_limit(dumpinfo.dirfd, &rights) < 0 &&

cap_rights_init(&rights, CAP_CREATE, CAP_FCNTL,

CAP_FTRUNCATE, CAP_LOOKUP, CAP_SEEK, CAP_WRITE);

if (cap_rights_limit(dumpinfo.dirfd, &rights) < 0 &&

@@ -2652,6 +2711,8 @@ DIAG_ON_ASSIGN_ENUM

dlt = new_dlt;

ndo->ndo_if_printer = get_if_printer(dlt);

dlt = new_dlt;

ndo->ndo_if_printer = get_if_printer(dlt);

+ /* Free the old filter */

+ pcap_freecode(&fcode);

if (pcap_compile(pd, &fcode, cmdbuf, Oflag, netmask) < 0)

error("%s", pcap_geterr(pd));

}

if (pcap_compile(pd, &fcode, cmdbuf, Oflag, netmask) < 0)

error("%s", pcap_geterr(pd));

}

@@ -2686,7 +2747,7 @@ DIAG_ON_ASSIGN_ENUM

free(cmdbuf);

pcap_freecode(&fcode);

free(cmdbuf);

pcap_freecode(&fcode);

- exit_tcpdump(status == -1 ? 1 : 0);

+ exit_tcpdump(status == -1 ? S_ERR_HOST_PROGRAM : S_SUCCESS);

}

@@ -2702,7 +2763,14 @@ static void

memset(&new, 0, sizeof(new));

new.sa_handler = func;

memset(&new, 0, sizeof(new));

new.sa_handler = func;

- if (sig == SIGCHLD)

+ if ((sig == SIGCHLD)

+# ifdef SIGNAL_REQ_INFO

+ || (sig == SIGNAL_REQ_INFO)

+# endif

+# ifdef SIGNAL_FLUSH_PCAP

+ || (sig == SIGNAL_FLUSH_PCAP)

+# endif

+ )

new.sa_flags = SA_RESTART;

if (sigaction(sig, &new, &old) < 0)

return (SIG_ERR);

new.sa_flags = SA_RESTART;

if (sigaction(sig, &new, &old) < 0)

return (SIG_ERR);

@@ -3231,9 +3299,11 @@ print_usage(FILE *f)

"\t\t" m_FLAG_USAGE "\n");

#endif

(void)fprintf(f,

"\t\t" m_FLAG_USAGE "\n");

#endif

(void)fprintf(f,

-"\t\t[ -M secret ] [ --number ] [ --print ]" Q_FLAG_USAGE "\n");

+"\t\t[ -M secret ] [ --number ] [ --print ]\n");

+ (void)fprintf(f,

+"\t\t[ --print-sampling nth ]" Q_FLAG_USAGE " [ -r file ]\n");

(void)fprintf(f,

-"\t\t[ -r file ] [ -s snaplen ] [ -T type ] [ --version ]\n");

+"\t\t[ -s snaplen ] [ -T type ] [ --version ]\n");

(void)fprintf(f,

"\t\t[ -V file ] [ -w file ] [ -W filecount ] [ -y datalinktype ]\n");

#ifdef HAVE_PCAP_SET_TSTAMP_PRECISION

(void)fprintf(f,

"\t\t[ -V file ] [ -w file ] [ -W filecount ] [ -y datalinktype ]\n");

#ifdef HAVE_PCAP_SET_TSTAMP_PRECISION