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
56 lines
1.8 KiB
C
56 lines
1.8 KiB
C
/*
|
|
* Copyright (c) 1998-2006 The TCPDUMP project
|
|
*
|
|
* 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)
|
|
*/
|
|
|
|
extern const struct tok af_values[];
|
|
extern const struct tok bsd_af_values[];
|
|
|
|
/* RFC1700 address family numbers */
|
|
#define AFNUM_INET 1
|
|
#define AFNUM_INET6 2
|
|
#define AFNUM_NSAP 3
|
|
#define AFNUM_HDLC 4
|
|
#define AFNUM_BBN1822 5
|
|
#define AFNUM_802 6
|
|
#define AFNUM_E163 7
|
|
#define AFNUM_E164 8
|
|
#define AFNUM_F69 9
|
|
#define AFNUM_X121 10
|
|
#define AFNUM_IPX 11
|
|
#define AFNUM_ATALK 12
|
|
#define AFNUM_DECNET 13
|
|
#define AFNUM_BANYAN 14
|
|
#define AFNUM_E164NSAP 15
|
|
#define AFNUM_VPLS 25
|
|
/* draft-kompella-ppvpn-l2vpn */
|
|
#define AFNUM_L2VPN 196 /* still to be approved by IANA */
|
|
|
|
/*
|
|
* BSD AF_ values.
|
|
*
|
|
* Unfortunately, the BSDs don't all use the same value for AF_INET6,
|
|
* so, because we want to be able to read captures from all of the BSDs,
|
|
* we check for all of them.
|
|
*/
|
|
#define BSD_AFNUM_INET 2
|
|
#define BSD_AFNUM_NS 6 /* XEROX NS protocols */
|
|
#define BSD_AFNUM_ISO 7
|
|
#define BSD_AFNUM_APPLETALK 16
|
|
#define BSD_AFNUM_IPX 23
|
|
#define BSD_AFNUM_INET6_BSD 24 /* NetBSD, OpenBSD, BSD/OS, Npcap */
|
|
#define BSD_AFNUM_INET6_FREEBSD 28 /* FreeBSD */
|
|
#define BSD_AFNUM_INET6_DARWIN 30 /* OS X, iOS, other Darwin-based OSes */
|