3340d77368
It fixes many buffer overflow in different protocol parsers, but none of them are critical, even in absense of Capsicum. Security: CVE-2016-7922, CVE-2016-7923, CVE-2016-7924, CVE-2016-7925 Security: CVE-2016-7926, CVE-2016-7927, CVE-2016-7928, CVE-2016-7929 Security: CVE-2016-7930, CVE-2016-7931, CVE-2016-7932, CVE-2016-7933 Security: CVE-2016-7934, CVE-2016-7935, CVE-2016-7936, CVE-2016-7937 Security: CVE-2016-7938, CVE-2016-7939, CVE-2016-7940, CVE-2016-7973 Security: CVE-2016-7974, CVE-2016-7975, CVE-2016-7983, CVE-2016-7984 Security: CVE-2016-7985, CVE-2016-7986, CVE-2016-7992, CVE-2016-7993 Security: CVE-2016-8574, CVE-2016-8575, CVE-2017-5202, CVE-2017-5203 Security: CVE-2017-5204, CVE-2017-5205, CVE-2017-5341, CVE-2017-5342 Security: CVE-2017-5482, CVE-2017-5483, CVE-2017-5484, CVE-2017-5485 Security: CVE-2017-5486
130 lines
2.6 KiB
C
130 lines
2.6 KiB
C
/*
|
|
* Oracle
|
|
*/
|
|
|
|
/* \summary: Oracle DLT_PPI printer */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <netdissect-stdinc.h>
|
|
|
|
#include "netdissect.h"
|
|
#include "extract.h"
|
|
|
|
typedef struct ppi_header {
|
|
uint8_t ppi_ver;
|
|
uint8_t ppi_flags;
|
|
uint16_t ppi_len;
|
|
uint32_t ppi_dlt;
|
|
} ppi_header_t;
|
|
|
|
#define PPI_HDRLEN 8
|
|
|
|
#ifdef DLT_PPI
|
|
|
|
static inline void
|
|
ppi_header_print(netdissect_options *ndo, const u_char *bp, u_int length)
|
|
{
|
|
const ppi_header_t *hdr;
|
|
uint16_t len;
|
|
uint32_t dlt;
|
|
const char *dltname;
|
|
|
|
hdr = (const ppi_header_t *)bp;
|
|
|
|
len = EXTRACT_LE_16BITS(&hdr->ppi_len);
|
|
dlt = EXTRACT_LE_32BITS(&hdr->ppi_dlt);
|
|
dltname = pcap_datalink_val_to_name(dlt);
|
|
|
|
if (!ndo->ndo_qflag) {
|
|
ND_PRINT((ndo, "V.%d DLT %s (%d) len %d", hdr->ppi_ver,
|
|
(dltname != NULL ? dltname : "UNKNOWN"), dlt,
|
|
len));
|
|
} else {
|
|
ND_PRINT((ndo, "%s", (dltname != NULL ? dltname : "UNKNOWN")));
|
|
}
|
|
|
|
ND_PRINT((ndo, ", length %u: ", length));
|
|
}
|
|
|
|
static u_int
|
|
ppi_print(netdissect_options *ndo,
|
|
const struct pcap_pkthdr *h, const u_char *p)
|
|
{
|
|
if_printer printer;
|
|
const ppi_header_t *hdr;
|
|
u_int caplen = h->caplen;
|
|
u_int length = h->len;
|
|
uint16_t len;
|
|
uint32_t dlt;
|
|
uint32_t hdrlen;
|
|
struct pcap_pkthdr nhdr;
|
|
|
|
if (caplen < sizeof(ppi_header_t)) {
|
|
ND_PRINT((ndo, "[|ppi]"));
|
|
return (caplen);
|
|
}
|
|
|
|
hdr = (const ppi_header_t *)p;
|
|
len = EXTRACT_LE_16BITS(&hdr->ppi_len);
|
|
if (caplen < len) {
|
|
/*
|
|
* If we don't have the entire PPI header, don't
|
|
* bother.
|
|
*/
|
|
ND_PRINT((ndo, "[|ppi]"));
|
|
return (caplen);
|
|
}
|
|
if (len < sizeof(ppi_header_t)) {
|
|
ND_PRINT((ndo, "[|ppi]"));
|
|
return (len);
|
|
}
|
|
dlt = EXTRACT_LE_32BITS(&hdr->ppi_dlt);
|
|
|
|
if (ndo->ndo_eflag)
|
|
ppi_header_print(ndo, p, length);
|
|
|
|
length -= len;
|
|
caplen -= len;
|
|
p += len;
|
|
|
|
if ((printer = lookup_printer(dlt)) != NULL) {
|
|
nhdr = *h;
|
|
nhdr.caplen = caplen;
|
|
nhdr.len = length;
|
|
hdrlen = printer(ndo, &nhdr, p);
|
|
} else {
|
|
if (!ndo->ndo_eflag)
|
|
ppi_header_print(ndo, (const u_char *)hdr, length + len);
|
|
|
|
if (!ndo->ndo_suppress_default_print)
|
|
ND_DEFAULTPRINT(p, caplen);
|
|
hdrlen = 0;
|
|
}
|
|
return (len + hdrlen);
|
|
}
|
|
|
|
/*
|
|
* This is the top level routine of the printer. 'p' points
|
|
* to the ether header of the packet, 'h->ts' is the timestamp,
|
|
* 'h->len' is the length of the packet off the wire, and 'h->caplen'
|
|
* is the number of bytes actually captured.
|
|
*/
|
|
u_int
|
|
ppi_if_print(netdissect_options *ndo,
|
|
const struct pcap_pkthdr *h, const u_char *p)
|
|
{
|
|
return (ppi_print(ndo, h, p));
|
|
}
|
|
|
|
/*
|
|
* Local Variables:
|
|
* c-style: whitesmith
|
|
* c-basic-offset: 8
|
|
* End:
|
|
*/
|
|
|
|
#endif /* DLT_PPI */
|