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
63 lines
2.8 KiB
C
63 lines
2.8 KiB
C
/*
|
|
* Copyright (c) 1990, 1992, 1993, 1994, 1995, 1996, 1997
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
/*
|
|
* Definitions to let us compile most of the IPv6 code even on systems
|
|
* without IPv6 support.
|
|
*/
|
|
#ifndef INET6_ADDRSTRLEN
|
|
#define INET6_ADDRSTRLEN 46
|
|
#endif
|
|
|
|
/* Name to address translation routines. */
|
|
|
|
enum {
|
|
LINKADDR_ETHER,
|
|
LINKADDR_FRELAY,
|
|
LINKADDR_IEEE1394,
|
|
LINKADDR_ATM,
|
|
LINKADDR_OTHER
|
|
};
|
|
|
|
#define BUFSIZE 128
|
|
|
|
extern const char *linkaddr_string(netdissect_options *, const u_char *, const unsigned int, const unsigned int);
|
|
extern const char *etheraddr_string(netdissect_options *, const u_char *);
|
|
extern const char *le64addr_string(netdissect_options *, const u_char *);
|
|
extern const char *etherproto_string(netdissect_options *, u_short);
|
|
extern const char *tcpport_string(netdissect_options *, u_short);
|
|
extern const char *udpport_string(netdissect_options *, u_short);
|
|
extern const char *isonsap_string(netdissect_options *, const u_char *, register u_int);
|
|
extern const char *dnaddr_string(netdissect_options *, u_short);
|
|
extern const char *protoid_string(netdissect_options *, const u_char *);
|
|
extern const char *ipxsap_string(netdissect_options *, u_short);
|
|
extern const char *getname(netdissect_options *, const u_char *);
|
|
extern const char *getname6(netdissect_options *, const u_char *);
|
|
extern const char *intoa(uint32_t);
|
|
|
|
extern void init_addrtoname(netdissect_options *, uint32_t, uint32_t);
|
|
extern struct hnamemem *newhnamemem(netdissect_options *);
|
|
extern struct h6namemem *newh6namemem(netdissect_options *);
|
|
extern const char * ieee8021q_tci_string(const uint16_t);
|
|
|
|
#define ipaddr_string(ndo, p) getname(ndo, (const u_char *)(p))
|
|
#define ip6addr_string(ndo, p) getname6(ndo, (const u_char *)(p))
|