37e2725e53
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
96 lines
3.4 KiB
C
96 lines
3.4 KiB
C
/*
|
|
* 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, and (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.
|
|
* 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.
|
|
*
|
|
* Original code by Hannes Gredler (hannes@gredler.at)
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <netdissect-stdinc.h>
|
|
#include "netdissect.h"
|
|
#include "l2vpn.h"
|
|
|
|
/*
|
|
* BGP Layer 2 Encapsulation Types
|
|
*
|
|
* RFC 6624
|
|
*
|
|
* http://www.iana.org/assignments/bgp-parameters/bgp-parameters.xhtml#bgp-l2-encapsulation-types-registry
|
|
*/
|
|
const struct tok l2vpn_encaps_values[] = {
|
|
{ 0, "Reserved"},
|
|
{ 1, "Frame Relay"},
|
|
{ 2, "ATM AAL5 SDU VCC transport"},
|
|
{ 3, "ATM transparent cell transport"},
|
|
{ 4, "Ethernet (VLAN) Tagged Mode"},
|
|
{ 5, "Ethernet Raw Mode"},
|
|
{ 6, "Cisco HDLC"},
|
|
{ 7, "PPP"},
|
|
{ 8, "SONET/SDH Circuit Emulation Service over MPLS"},
|
|
{ 9, "ATM n-to-one VCC cell transport"},
|
|
{ 10, "ATM n-to-one VPC cell transport"},
|
|
{ 11, "IP layer 2 transport"},
|
|
{ 15, "Frame Relay Port mode"},
|
|
{ 17, "Structure-agnostic E1 over packet"},
|
|
{ 18, "Structure-agnostic T1 (DS1) over packet"},
|
|
{ 19, "VPLS"},
|
|
{ 20, "Structure-agnostic T3 (DS3) over packet"},
|
|
{ 21, "Nx64kbit/s Basic Service using Structure-aware"},
|
|
{ 25, "Frame Relay DLCI"},
|
|
{ 40, "Structure-agnostic E3 over packet"},
|
|
{ 41, "Octet-aligned playload for Structure-agnostic DS1 circuits"},
|
|
{ 42, "E1 Nx64kbit/s with CAS using Structure-aware"},
|
|
{ 43, "DS1 (ESF) Nx64kbit/s with CAS using Structure-aware"},
|
|
{ 44, "DS1 (SF) Nx64kbit/s with CAS using Structure-aware"},
|
|
{ 0, NULL}
|
|
};
|
|
|
|
/*
|
|
* MPLS Pseudowire Types
|
|
*
|
|
* RFC 4446
|
|
*
|
|
* http://www.iana.org/assignments/pwe3-parameters/pwe3-parameters.xhtml#pwe3-parameters-2
|
|
*/
|
|
const struct tok mpls_pw_types_values[] = {
|
|
{ 0x0000, "Reserved"},
|
|
{ 0x0001, "Frame Relay DLCI (Martini Mode)"},
|
|
{ 0x0002, "ATM AAL5 SDU VCC transport"},
|
|
{ 0x0003, "ATM transparent cell transport"},
|
|
{ 0x0004, "Ethernet VLAN"},
|
|
{ 0x0005, "Ethernet"},
|
|
{ 0x0006, "Cisco-HDLC"},
|
|
{ 0x0007, "PPP"},
|
|
{ 0x0008, "SONET/SDH Circuit Emulation Service over MPLS"},
|
|
{ 0x0009, "ATM n-to-one VCC cell transport"},
|
|
{ 0x000a, "ATM n-to-one VPC cell transport"},
|
|
{ 0x000b, "IP Layer2 Transport"},
|
|
{ 0x000c, "ATM one-to-one VCC Cell Mode"},
|
|
{ 0x000d, "ATM one-to-one VPC Cell Mode"},
|
|
{ 0x000e, "ATM AAL5 PDU VCC transport"},
|
|
{ 0x000f, "Frame-Relay Port mode"},
|
|
{ 0x0010, "SONET/SDH Circuit Emulation over Packet"},
|
|
{ 0x0011, "Structure-agnostic E1 over Packet"},
|
|
{ 0x0012, "Structure-agnostic T1 (DS1) over Packet"},
|
|
{ 0x0013, "Structure-agnostic E3 over Packet"},
|
|
{ 0x0014, "Structure-agnostic T3 (DS3) over Packet"},
|
|
{ 0x0015, "CESoPSN basic mode"},
|
|
{ 0x0016, "TDMoIP basic mode"},
|
|
{ 0x0017, "CESoPSN TDM with CAS"},
|
|
{ 0x0018, "TDMoIP TDM with CAS"},
|
|
{ 0x0019, "Frame Relay DLCI"},
|
|
{ 0x0040, "IP-interworking"},
|
|
{ 0, NULL}
|
|
};
|