mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-13 10:02:38 +00:00
0bff6a5af8
It contains many fixes, including bounds checking, buffer overflows (in SLIP and bittok2str_internal), buffer over-reads, and infinite loops. One other notable change: Do not use getprotobynumber() for protocol name resolution. Do not do any protocol name resolution if -n is specified. Submitted by: gordon Reviewed by: delphij, emaste, glebius MFC after: 1 week Relnotes: Yes Security: CVE-2017-11108, CVE-2017-11541, CVE-2017-11542 Security: CVE-2017-11543, CVE-2017-12893, CVE-2017-12894 Security: CVE-2017-12895, CVE-2017-12896, CVE-2017-12897 Security: CVE-2017-12898, CVE-2017-12899, CVE-2017-12900 Security: CVE-2017-12901, CVE-2017-12902, CVE-2017-12985 Security: CVE-2017-12986, CVE-2017-12987, CVE-2017-12988 Security: CVE-2017-12989, CVE-2017-12990, CVE-2017-12991 Security: CVE-2017-12992, CVE-2017-12993, CVE-2017-12994 Security: CVE-2017-12995, CVE-2017-12996, CVE-2017-12997 Security: CVE-2017-12998, CVE-2017-12999, CVE-2017-13000 Security: CVE-2017-13001, CVE-2017-13002, CVE-2017-13003 Security: CVE-2017-13004, CVE-2017-13005, CVE-2017-13006 Security: CVE-2017-13007, CVE-2017-13008, CVE-2017-13009 Security: CVE-2017-13010, CVE-2017-13011, CVE-2017-13012 Security: CVE-2017-13013, CVE-2017-13014, CVE-2017-13015 Security: CVE-2017-13016, CVE-2017-13017, CVE-2017-13018 Security: CVE-2017-13019, CVE-2017-13020, CVE-2017-13021 Security: CVE-2017-13022, CVE-2017-13023, CVE-2017-13024 Security: CVE-2017-13025, CVE-2017-13026, CVE-2017-13027 Security: CVE-2017-13028, CVE-2017-13029, CVE-2017-13030 Security: CVE-2017-13031, CVE-2017-13032, CVE-2017-13033 Security: CVE-2017-13034, CVE-2017-13035, CVE-2017-13036 Security: CVE-2017-13037, CVE-2017-13038, CVE-2017-13039 Security: CVE-2017-13040, CVE-2017-13041, CVE-2017-13042 Security: CVE-2017-13043, CVE-2017-13044, CVE-2017-13045 Security: CVE-2017-13046, CVE-2017-13047, CVE-2017-13048 Security: CVE-2017-13049, CVE-2017-13050, CVE-2017-13051 Security: CVE-2017-13052, CVE-2017-13053, CVE-2017-13054 Security: CVE-2017-13055, CVE-2017-13687, CVE-2017-13688 Security: CVE-2017-13689, CVE-2017-13690, CVE-2017-13725 Differential Revision: https://reviews.freebsd.org/D12404
224 lines
5.5 KiB
C
224 lines
5.5 KiB
C
/*
|
|
* Copyright (c) 2009
|
|
* Siemens AG, All rights reserved.
|
|
* Dmitry Eremin-Solenikov (dbaryshkov@gmail.com)
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that: (1) source code distributions
|
|
* retain the above copyright notice and this paragraph in its entirety, (2)
|
|
* distributions including binary code include the above copyright notice and
|
|
* this paragraph in its entirety in the documentation or other materials
|
|
* provided with the distribution, and (3) all advertising materials mentioning
|
|
* features or use of this software display the following acknowledgement:
|
|
* ``This product includes software developed by the University of California,
|
|
* Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
|
|
* the University nor the names of its contributors may be used to endorse
|
|
* or promote products derived from this software without specific prior
|
|
* written permission.
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
|
|
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
*/
|
|
|
|
/* \summary: IEEE 802.15.4 printer */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <netdissect-stdinc.h>
|
|
|
|
#include "netdissect.h"
|
|
#include "addrtoname.h"
|
|
|
|
#include "extract.h"
|
|
|
|
static const char *ftypes[] = {
|
|
"Beacon", /* 0 */
|
|
"Data", /* 1 */
|
|
"ACK", /* 2 */
|
|
"Command", /* 3 */
|
|
"Reserved (0x4)", /* 4 */
|
|
"Reserved (0x5)", /* 5 */
|
|
"Reserved (0x6)", /* 6 */
|
|
"Reserved (0x7)", /* 7 */
|
|
};
|
|
|
|
/*
|
|
* Frame Control subfields.
|
|
*/
|
|
#define FC_FRAME_TYPE(fc) ((fc) & 0x7)
|
|
#define FC_SECURITY_ENABLED 0x0008
|
|
#define FC_FRAME_PENDING 0x0010
|
|
#define FC_ACK_REQUEST 0x0020
|
|
#define FC_PAN_ID_COMPRESSION 0x0040
|
|
#define FC_DEST_ADDRESSING_MODE(fc) (((fc) >> 10) & 0x3)
|
|
#define FC_FRAME_VERSION(fc) (((fc) >> 12) & 0x3)
|
|
#define FC_SRC_ADDRESSING_MODE(fc) (((fc) >> 14) & 0x3)
|
|
|
|
#define FC_ADDRESSING_MODE_NONE 0x00
|
|
#define FC_ADDRESSING_MODE_RESERVED 0x01
|
|
#define FC_ADDRESSING_MODE_SHORT 0x02
|
|
#define FC_ADDRESSING_MODE_LONG 0x03
|
|
|
|
u_int
|
|
ieee802_15_4_if_print(netdissect_options *ndo,
|
|
const struct pcap_pkthdr *h, const u_char *p)
|
|
{
|
|
u_int caplen = h->caplen;
|
|
u_int hdrlen;
|
|
uint16_t fc;
|
|
uint8_t seq;
|
|
uint16_t panid = 0;
|
|
|
|
if (caplen < 3) {
|
|
ND_PRINT((ndo, "[|802.15.4]"));
|
|
return caplen;
|
|
}
|
|
hdrlen = 3;
|
|
|
|
fc = EXTRACT_LE_16BITS(p);
|
|
seq = EXTRACT_LE_8BITS(p + 2);
|
|
|
|
p += 3;
|
|
caplen -= 3;
|
|
|
|
ND_PRINT((ndo,"IEEE 802.15.4 %s packet ", ftypes[FC_FRAME_TYPE(fc)]));
|
|
if (ndo->ndo_vflag)
|
|
ND_PRINT((ndo,"seq %02x ", seq));
|
|
|
|
/*
|
|
* Destination address and PAN ID, if present.
|
|
*/
|
|
switch (FC_DEST_ADDRESSING_MODE(fc)) {
|
|
case FC_ADDRESSING_MODE_NONE:
|
|
if (fc & FC_PAN_ID_COMPRESSION) {
|
|
/*
|
|
* PAN ID compression; this requires that both
|
|
* the source and destination addresses be present,
|
|
* but the destination address is missing.
|
|
*/
|
|
ND_PRINT((ndo, "[|802.15.4]"));
|
|
return hdrlen;
|
|
}
|
|
if (ndo->ndo_vflag)
|
|
ND_PRINT((ndo,"none "));
|
|
break;
|
|
case FC_ADDRESSING_MODE_RESERVED:
|
|
if (ndo->ndo_vflag)
|
|
ND_PRINT((ndo,"reserved destination addressing mode"));
|
|
return hdrlen;
|
|
case FC_ADDRESSING_MODE_SHORT:
|
|
if (caplen < 2) {
|
|
ND_PRINT((ndo, "[|802.15.4]"));
|
|
return hdrlen;
|
|
}
|
|
panid = EXTRACT_LE_16BITS(p);
|
|
p += 2;
|
|
caplen -= 2;
|
|
hdrlen += 2;
|
|
if (caplen < 2) {
|
|
ND_PRINT((ndo, "[|802.15.4]"));
|
|
return hdrlen;
|
|
}
|
|
if (ndo->ndo_vflag)
|
|
ND_PRINT((ndo,"%04x:%04x ", panid, EXTRACT_LE_16BITS(p)));
|
|
p += 2;
|
|
caplen -= 2;
|
|
hdrlen += 2;
|
|
break;
|
|
case FC_ADDRESSING_MODE_LONG:
|
|
if (caplen < 2) {
|
|
ND_PRINT((ndo, "[|802.15.4]"));
|
|
return hdrlen;
|
|
}
|
|
panid = EXTRACT_LE_16BITS(p);
|
|
p += 2;
|
|
caplen -= 2;
|
|
hdrlen += 2;
|
|
if (caplen < 8) {
|
|
ND_PRINT((ndo, "[|802.15.4]"));
|
|
return hdrlen;
|
|
}
|
|
if (ndo->ndo_vflag)
|
|
ND_PRINT((ndo,"%04x:%s ", panid, le64addr_string(ndo, p)));
|
|
p += 8;
|
|
caplen -= 8;
|
|
hdrlen += 8;
|
|
break;
|
|
}
|
|
if (ndo->ndo_vflag)
|
|
ND_PRINT((ndo,"< "));
|
|
|
|
/*
|
|
* Source address and PAN ID, if present.
|
|
*/
|
|
switch (FC_SRC_ADDRESSING_MODE(fc)) {
|
|
case FC_ADDRESSING_MODE_NONE:
|
|
if (ndo->ndo_vflag)
|
|
ND_PRINT((ndo,"none "));
|
|
break;
|
|
case FC_ADDRESSING_MODE_RESERVED:
|
|
if (ndo->ndo_vflag)
|
|
ND_PRINT((ndo,"reserved source addressing mode"));
|
|
return 0;
|
|
case FC_ADDRESSING_MODE_SHORT:
|
|
if (!(fc & FC_PAN_ID_COMPRESSION)) {
|
|
/*
|
|
* The source PAN ID is not compressed out, so
|
|
* fetch it. (Otherwise, we'll use the destination
|
|
* PAN ID, fetched above.)
|
|
*/
|
|
if (caplen < 2) {
|
|
ND_PRINT((ndo, "[|802.15.4]"));
|
|
return hdrlen;
|
|
}
|
|
panid = EXTRACT_LE_16BITS(p);
|
|
p += 2;
|
|
caplen -= 2;
|
|
hdrlen += 2;
|
|
}
|
|
if (caplen < 2) {
|
|
ND_PRINT((ndo, "[|802.15.4]"));
|
|
return hdrlen;
|
|
}
|
|
if (ndo->ndo_vflag)
|
|
ND_PRINT((ndo,"%04x:%04x ", panid, EXTRACT_LE_16BITS(p)));
|
|
p += 2;
|
|
caplen -= 2;
|
|
hdrlen += 2;
|
|
break;
|
|
case FC_ADDRESSING_MODE_LONG:
|
|
if (!(fc & FC_PAN_ID_COMPRESSION)) {
|
|
/*
|
|
* The source PAN ID is not compressed out, so
|
|
* fetch it. (Otherwise, we'll use the destination
|
|
* PAN ID, fetched above.)
|
|
*/
|
|
if (caplen < 2) {
|
|
ND_PRINT((ndo, "[|802.15.4]"));
|
|
return hdrlen;
|
|
}
|
|
panid = EXTRACT_LE_16BITS(p);
|
|
p += 2;
|
|
caplen -= 2;
|
|
hdrlen += 2;
|
|
}
|
|
if (caplen < 8) {
|
|
ND_PRINT((ndo, "[|802.15.4]"));
|
|
return hdrlen;
|
|
}
|
|
if (ndo->ndo_vflag)
|
|
ND_PRINT((ndo,"%04x:%s ", panid, le64addr_string(ndo, p)));
|
|
p += 8;
|
|
caplen -= 8;
|
|
hdrlen += 8;
|
|
break;
|
|
}
|
|
|
|
if (!ndo->ndo_suppress_default_print)
|
|
ND_DEFAULTPRINT(p, caplen);
|
|
|
|
return hdrlen;
|
|
}
|