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
123 lines
4.4 KiB
C
123 lines
4.4 KiB
C
/* -*- Mode: c; tab-width: 8; indent-tabs-mode: 1; c-basic-offset: 8; -*- */
|
|
/*
|
|
* Copyright (c) 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 the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the Computer Systems
|
|
* Engineering Group at Lawrence Berkeley Laboratory.
|
|
* 4. Neither the name of the University nor of the Laboratory may be used
|
|
* to endorse or promote products derived from this software without
|
|
* specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef lib_funcattrs_h
|
|
#define lib_funcattrs_h
|
|
|
|
/*
|
|
* Attributes to apply to functions and their arguments, using various
|
|
* compiler-specific extensions.
|
|
*/
|
|
|
|
/*
|
|
* This was introduced by Clang:
|
|
*
|
|
* http://clang.llvm.org/docs/LanguageExtensions.html#has-attribute
|
|
*
|
|
* in some version (which version?); it has been picked up by GCC 5.0.
|
|
*/
|
|
#ifndef __has_attribute
|
|
/*
|
|
* It's a macro, so you can check whether it's defined to check
|
|
* whether it's supported.
|
|
*
|
|
* If it's not, define it to always return 0, so that we move on to
|
|
* the fallback checks.
|
|
*/
|
|
#define __has_attribute(x) 0
|
|
#endif
|
|
|
|
/*
|
|
* NORETURN, before a function declaration, means "this function
|
|
* never returns". (It must go before the function declaration, e.g.
|
|
* "extern NORETURN func(...)" rather than after the function
|
|
* declaration, as the MSVC version has to go before the declaration.)
|
|
*/
|
|
#if __has_attribute(noreturn) \
|
|
|| (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \
|
|
|| (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) \
|
|
|| (defined(__xlC__) && __xlC__ >= 0x0A01) \
|
|
|| (defined(__HP_aCC) && __HP_aCC >= 61000)
|
|
/*
|
|
* Compiler with support for __attribute((noreturn)), or GCC 2.5 and
|
|
* later, or Solaris Studio 12 (Sun C 5.9) and later, or IBM XL C 10.1
|
|
* and later (do any earlier versions of XL C support this?), or
|
|
* HP aCC A.06.10 and later.
|
|
*/
|
|
#define NORETURN __attribute((noreturn))
|
|
#elif defined(_MSC_VER)
|
|
/*
|
|
* MSVC.
|
|
*/
|
|
#define NORETURN __declspec(noreturn)
|
|
#else
|
|
#define NORETURN
|
|
#endif
|
|
|
|
/*
|
|
* PRINTFLIKE(x,y), after a function declaration, means "this function
|
|
* does printf-style formatting, with the xth argument being the format
|
|
* string and the yth argument being the first argument for the format
|
|
* string".
|
|
*/
|
|
#if __has_attribute(__format__) \
|
|
|| (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 203)) \
|
|
|| (defined(__xlC__) && __xlC__ >= 0x0A01) \
|
|
|| (defined(__HP_aCC) && __HP_aCC >= 61000)
|
|
/*
|
|
* Compiler with support for it, or GCC 2.3 and later, or IBM XL C 10.1
|
|
* and later (do any earlier versions of XL C support this?),
|
|
* or HP aCC A.06.10 and later.
|
|
*/
|
|
#define PRINTFLIKE(x,y) __attribute__((__format__(__printf__,x,y)))
|
|
#else
|
|
#define PRINTFLIKE(x,y)
|
|
#endif
|
|
|
|
/*
|
|
* For flagging arguments as format strings in MSVC.
|
|
*/
|
|
#if _MSC_VER >= 1400
|
|
#include <sal.h>
|
|
#if _MSC_VER > 1400
|
|
#define FORMAT_STRING(p) _Printf_format_string_ p
|
|
#else
|
|
#define FORMAT_STRING(p) __format_string p
|
|
#endif
|
|
#else
|
|
#define FORMAT_STRING(p) p
|
|
#endif
|
|
|
|
#endif /* lib_funcattrs_h */
|