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
105 lines
3.8 KiB
C
105 lines
3.8 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 "oui.h"
|
|
|
|
/* FIXME complete OUI list using a script */
|
|
|
|
const struct tok oui_values[] = {
|
|
{ OUI_ENCAP_ETHER, "Ethernet" },
|
|
{ OUI_CISCO, "Cisco" },
|
|
{ OUI_IANA, "IANA" },
|
|
{ OUI_NORTEL, "Nortel Networks SONMP" },
|
|
{ OUI_CISCO_90, "Cisco bridged" },
|
|
{ OUI_RFC2684, "Ethernet bridged" },
|
|
{ OUI_ATM_FORUM, "ATM Forum" },
|
|
{ OUI_CABLE_BPDU, "DOCSIS Spanning Tree" },
|
|
{ OUI_APPLETALK, "Appletalk" },
|
|
{ OUI_JUNIPER, "Juniper" },
|
|
{ OUI_HP, "Hewlett-Packard" },
|
|
{ OUI_IEEE_8021_PRIVATE, "IEEE 802.1 Private"},
|
|
{ OUI_IEEE_8023_PRIVATE, "IEEE 802.3 Private"},
|
|
{ OUI_TIA, "ANSI/TIA"},
|
|
{ OUI_DCBX, "DCBX"},
|
|
{ OUI_NICIRA, "Nicira Networks" },
|
|
{ OUI_BSN, "Big Switch Networks" },
|
|
{ OUI_VELLO, "Vello Systems" },
|
|
{ OUI_HP2, "HP" },
|
|
{ OUI_HPLABS, "HP-Labs" },
|
|
{ OUI_INFOBLOX, "Infoblox Inc" },
|
|
{ OUI_ONLAB, "Open Networking Lab" },
|
|
{ OUI_FREESCALE, "Freescale" },
|
|
{ OUI_NETRONOME, "Netronome" },
|
|
{ 0, NULL }
|
|
};
|
|
|
|
/*
|
|
* SMI Network Management Private Enterprise Codes for organizations.
|
|
*
|
|
* XXX - these also appear in FreeRadius dictionary files, with items such
|
|
* as
|
|
*
|
|
* VENDOR Cisco 9
|
|
*
|
|
* List taken from Ethereal's epan/sminmpec.c.
|
|
*/
|
|
const struct tok smi_values[] = {
|
|
{ SMI_IETF, "IETF (reserved)"},
|
|
{ SMI_ACC, "ACC"},
|
|
{ SMI_CISCO, "Cisco"},
|
|
{ SMI_HEWLETT_PACKARD, "Hewlett Packard"},
|
|
{ SMI_SUN_MICROSYSTEMS, "Sun Microsystems"},
|
|
{ SMI_MERIT, "Merit"},
|
|
{ SMI_SHIVA, "Shiva"},
|
|
{ SMI_ERICSSON, "Ericsson AB"},
|
|
{ SMI_CISCO_VPN5000, "Cisco VPN 5000"},
|
|
{ SMI_LIVINGSTON, "Livingston"},
|
|
{ SMI_MICROSOFT, "Microsoft"},
|
|
{ SMI_3COM, "3Com"},
|
|
{ SMI_ASCEND, "Ascend"},
|
|
{ SMI_BAY, "Bay Networks"},
|
|
{ SMI_FOUNDRY, "Foundry"},
|
|
{ SMI_VERSANET, "Versanet"},
|
|
{ SMI_REDBACK, "Redback"},
|
|
{ SMI_JUNIPER, "Juniper Networks"},
|
|
{ SMI_APTIS, "Aptis"},
|
|
{ SMI_CISCO_VPN3000, "Cisco VPN 3000"},
|
|
{ SMI_COSINE, "CoSine Communications"},
|
|
{ SMI_NETSCREEN, "Netscreen"},
|
|
{ SMI_SHASTA, "Shasta"},
|
|
{ SMI_NOMADIX, "Nomadix"},
|
|
{ SMI_SIEMENS, "Siemens"},
|
|
{ SMI_CABLELABS, "CableLabs"},
|
|
{ SMI_UNISPHERE, "Unisphere Networks"},
|
|
{ SMI_CISCO_BBSM, "Cisco BBSM"},
|
|
{ SMI_THE3GPP2, "3rd Generation Partnership Project 2 (3GPP2)"},
|
|
{ SMI_IP_UNPLUGGED, "ipUnplugged"},
|
|
{ SMI_ISSANNI, "Issanni Communications"},
|
|
{ SMI_QUINTUM, "Quintum"},
|
|
{ SMI_INTERLINK, "Interlink"},
|
|
{ SMI_COLUBRIS, "Colubris"},
|
|
{ SMI_COLUMBIA_UNIVERSITY, "Columbia University"},
|
|
{ SMI_THE3GPP, "3GPP"},
|
|
{ SMI_GEMTEK_SYSTEMS, "Gemtek-Systems"},
|
|
{ SMI_WIFI_ALLIANCE, "Wi-Fi Alliance"},
|
|
{ 0, NULL}
|
|
};
|