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
69 lines
1.7 KiB
C
69 lines
1.7 KiB
C
/*
|
|
* Copyright (C) 2000, Richard Sharpe
|
|
*
|
|
* This software may be distributed either under the terms of the
|
|
* BSD-style license that accompanies tcpdump or under the GNU GPL
|
|
* version 2 or later.
|
|
*
|
|
* print-beep.c
|
|
*
|
|
*/
|
|
|
|
/* \summary: Blocks Extensible Exchange Protocol (BEEP) printer */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <netdissect-stdinc.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include "netdissect.h"
|
|
|
|
/* Check for a string but not go beyond length
|
|
* Return TRUE on match, FALSE otherwise
|
|
*
|
|
* Looks at the first few chars up to tl1 ...
|
|
*/
|
|
|
|
static int
|
|
l_strnstart(netdissect_options *ndo, const char *tstr1, u_int tl1,
|
|
const char *str2, u_int l2)
|
|
{
|
|
if (!ND_TTEST2(*str2, tl1)) {
|
|
/*
|
|
* We don't have tl1 bytes worth of captured data
|
|
* for the string, so we can't check for this
|
|
* string.
|
|
*/
|
|
return 0;
|
|
}
|
|
if (tl1 > l2)
|
|
return 0;
|
|
|
|
return (strncmp(tstr1, str2, tl1) == 0 ? 1 : 0);
|
|
}
|
|
|
|
void
|
|
beep_print(netdissect_options *ndo, const u_char *bp, u_int length)
|
|
{
|
|
|
|
if (l_strnstart(ndo, "MSG", 4, (const char *)bp, length)) /* A REQuest */
|
|
ND_PRINT((ndo, " BEEP MSG"));
|
|
else if (l_strnstart(ndo, "RPY ", 4, (const char *)bp, length))
|
|
ND_PRINT((ndo, " BEEP RPY"));
|
|
else if (l_strnstart(ndo, "ERR ", 4, (const char *)bp, length))
|
|
ND_PRINT((ndo, " BEEP ERR"));
|
|
else if (l_strnstart(ndo, "ANS ", 4, (const char *)bp, length))
|
|
ND_PRINT((ndo, " BEEP ANS"));
|
|
else if (l_strnstart(ndo, "NUL ", 4, (const char *)bp, length))
|
|
ND_PRINT((ndo, " BEEP NUL"));
|
|
else if (l_strnstart(ndo, "SEQ ", 4, (const char *)bp, length))
|
|
ND_PRINT((ndo, " BEEP SEQ"));
|
|
else if (l_strnstart(ndo, "END", 4, (const char *)bp, length))
|
|
ND_PRINT((ndo, " BEEP END"));
|
|
else
|
|
ND_PRINT((ndo, " BEEP (payload or undecoded)"));
|
|
}
|