aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
AgeCommit message (Collapse)AuthorFilesLines
2018-02-08replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.Dario Lombardo27-27/+27
The first is deprecated, as per https://spdx.org/licenses/. Change-Id: I8e21e1d32d09b8b94b93a2dc9fbdde5ffeba6bed Reviewed-on: https://code.wireshark.org/review/25661 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-08json: Add for decode-as udp.portStig Bjørlykke1-0/+2
Change-Id: Ibd03cd64aa8de7fee8ad3cc7b7cc61e0370399ff Reviewed-on: https://code.wireshark.org/review/25681 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-02-08Cleanup HTTP Referer tracking code and use less memoryMoshe Kaplan1-66/+86
Change-Id: I7d9d8a1ab6ed9f180511281348d6b679b5fba1fb Reviewed-on: https://code.wireshark.org/review/25665 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Moshe Kaplan <me@moshekaplan.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-07Don't crash if an IDB resolution value is too high.Guy Harris1-23/+98
When dissecting an if_tsresol option in an IDB, calculate the resolution from the base and the offset. If the result overflows, mark it as an overflow; otherwise, mark it with the units for more values than 1 microsecond. Store the calculated resolution, which we initialize to the default of 1 microsecond. When displaying time stamps in blocks, use the calculated resolution, rather than re-calculating it. If it's 0, it means the resolution is too high, so don't calculate it and end up dividing by zero. Bug: 14402 Change-Id: Idc34ededb4f7250b3604b14d4468c32f6592793f Reviewed-on: https://code.wireshark.org/review/25673 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-07NSRPC: fix heuristic dissectorPascal Quantin1-2/+2
Do not check reported length but captured length, otherwise it can can trigger an exception when trying to fetch at offset 4. Once the (very basic heuristic) is verified, cann the right dissection function. Bug: 14399 Change-Id: Ie09d80e04f2501c940693a2ea9ecbd2f84d1e22f Reviewed-on: https://code.wireshark.org/review/25666 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-07[PFCP] Fixed order of bytes in UP Function Features IEMatej Tkac1-37/+45
3GPP TS 29.244 V14.2.0 Section 8.2.25 Change-Id: I22395d05bfcdb5dce5355c0836ffb9bbdef7a8dd Reviewed-on: https://code.wireshark.org/review/25631 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-07Generate HTTP Referer statisticsMoshe Kaplan2-5/+152
The main benefit of this feature is that it enables users to see the succession of HTTP requests that led to a specific request. A sample PCAP is available here: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=16085 Change-Id: I7c521315b848fbce659fdc01e43f261d804a3a48 Reviewed-on: https://code.wireshark.org/review/25319 Reviewed-by: Moshe Kaplan <me@moshekaplan.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-07LPPe: use V1_0-20160714-C specificationPascal Quantin7-5274/+3286
Bug: 14361 Change-Id: I845e732100d866913bd17742dc18593938baac4a Reviewed-on: https://code.wireshark.org/review/25646 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-07ieee1905: Fix the handling of AP Metric Queries.Richard Sharpe1-0/+9
They changed when the spec was updated. This seems to be the last change needed here. Change-Id: Id47c1de5b5890bffa0842c33ae02033ddf6c8325 Reviewed-on: https://code.wireshark.org/review/25656 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-07FCP: Add NULL check to prevent crash.Michael Mann1-1/+1
Fragmented FCP may not be called on the first pass, so add a NULL check for proto_data that may not be there. Bug: 14374 Change-Id: Icbbee8f0eb3a33655323283dbb5a01c350d784dc Reviewed-on: https://code.wireshark.org/review/25649 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-07Reapply "Fix typo in DTN dissector"Justin Dailey1-3/+3
Sgement -> Segment Change-Id: Ibf4aa2db14fd87c854a65da0de979ad4772243d8 Reviewed-on: https://code.wireshark.org/review/25640 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-on: https://code.wireshark.org/review/25648 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-06Temporarily revert "Fix typo in DTN dissector"Gerald Combs1-3/+3
This will be restored after the 2.5.0 release is complete. This reverts commit 61cc7691691c5f8bd2e11b2caffe52cd8e14aab2. Change-Id: I0b7d2435fe010070aaced5f395c75a1cd65b3f83 Reviewed-on: https://code.wireshark.org/review/25645 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-06Fix typo in DTN dissectorJustin Dailey1-3/+3
Sgement -> Segment Change-Id: I275495fafdf76308ca36083256d6fcd2bed35203 Reviewed-on: https://code.wireshark.org/review/25640 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-06Get rid of the pkt_encap field in struct packet_info.Guy Harris4-12/+18
pinfo->pkt_encap is jsut a copy of pinfo->phdr->pkt_encap; no need for the copy. Expand a comment while we're at it. Change-Id: I5fcfe694ecba42507f1d629d01440da0a0989501 Reviewed-on: https://code.wireshark.org/review/25643 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-06Change the way we infer the type of the physical address.Guy Harris1-3/+9
Use the address type of the link-layer source address, rather than the encapsulation of the outermost packet layer, to determine the type of the physical client address in a Dead Station frame. That should, for example, handle cases where the actual Ethernet packets are being carried within packets on some non-Ethernet network, or where the packets aren't Ethernet packets but are packets on some other network using MAC-48 addresses. Change-Id: Ibd2e2322b03e81aa52c71b080f3c91d2f83fc3b4 Reviewed-on: https://code.wireshark.org/review/25642 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-06[SBC-AP] Enhance info column information.AndersBroman2-5/+27
Change-Id: If02d2b1dcda5df8a09b3689b2ba3dc5914db3420 Reviewed-on: https://code.wireshark.org/review/25635 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-06[Thrift] Handle optional elememts in struct.AndersBroman2-1/+18
Change-Id: Iee494c299f8f10588146f0b41b759ce0272d9caf Reviewed-on: https://code.wireshark.org/review/25634 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-06[Thrift] Add methods for the 64bit types.AndersBroman2-0/+56
Change-Id: I4a3ca0eb715562c9ed535df471edb62830215369 Reviewed-on: https://code.wireshark.org/review/25630 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-06Use the Wayback Machine for a reference.Guy Harris1-1/+1
Change-Id: I4745cdf6ba863674525851e98c8a52422d4e65f0 Reviewed-on: https://code.wireshark.org/review/25628 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-06Use separate dissectors for LAPD and LAPD-with-Linux-SLL-header.Guy Harris1-7/+22
That obviates the need to check pinfo->pkt_encap. Change-Id: I038e065932282ce9d3362fbc9ba6ea653a63f399 Reviewed-on: https://code.wireshark.org/review/25627 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-06BACapp: Fix a loop check.Gerald Combs1-106/+107
Fix an offset check in a nested loop. Make our offset checks more paranoid. Bug: 14387 Change-Id: I2890b27731ec293a3cb08dcfdf7a18aef808ad31 Reviewed-on: https://code.wireshark.org/review/25622 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-02-06IPMI: Add NULL pointer checks.Gerald Combs1-2/+2
Check for a valid data->curr_frame in ipmi_set_data and ipmi_get_data. Bug: 14393 Change-Id: I615975015da864718dbd486d875aa3020db94edd Reviewed-on: https://code.wireshark.org/review/25621 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-02-06Thrift: stop dissection when encountering an unknown/unexpected typePascal Quantin1-39/+51
Let's add an expert info, and set offset to the end of the current tvb. Bug: 14379 Change-Id: Iaccf862c451eef58aaed11b26fceebf26bc2c818 Reviewed-on: https://code.wireshark.org/review/25619 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-05packet-mq: Fix a wrong offset+Add value in val_strRobert Grange1-140/+137
fixed an offset error for mqmo in gmo Added value in comment when defining val_str Change-Id: Ie29f65f96d2ffb96c0cc0623346432f1f8380168 Reviewed-on: https://code.wireshark.org/review/25604 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-02-05Update couchbase dissector with collections and delete_time DCPJim Walker1-3/+68
Add support for collection commands * SET/GET manifest * DCP changes (mutation/deletion/system_event) Add support for DCP delete_time, a new format for DCP deletion Change-Id: Iec2000a40da37dcb1edf665a157dc7ab30d4c9d0 Reviewed-on: https://code.wireshark.org/review/25612 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-02-05Update couchbase dissector with new HELLO feature valuesJim Walker1-1/+6
Simply add missing feature values to the existing table Change-Id: Ie4b0876df1d736af1cd1171a6645df75e2eb8cf2 Reviewed-on: https://code.wireshark.org/review/25611 Reviewed-by: Dave Rigby <daver@couchbase.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-04MQ: use real string length when calling strip_trailing_blanks()Pascal Quantin1-2/+2
Bug: 14390 Change-Id: I5acfc651237da55c3ee907f21d89a3add6edeeef Reviewed-on: https://code.wireshark.org/review/25596 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-02-04MQ: keep extended value string array sortedPascal Quantin2-2/+2
Change-Id: If7d6c8d75179eca213a90977657c61e9a9677474 Reviewed-on: https://code.wireshark.org/review/25595 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-02-04packet-mq: Fix problem in get_mq_pdu_lenRobert Grange1-5/+4
Found during fuzz test that the get_mq_pdu_len can return a 0 length pdu. Fix to at least return tvb_reported_length_remaining Change-Id: I6410f71724a6288fe42a4f600e72a8af787aa7eb Reviewed-on: https://code.wireshark.org/review/25574 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2018-02-04Don't assume address data is aligned.Guy Harris1-5/+9
The data for an address is *not* guaranteed to be aligned on any particular boundary, so, for IPv4 addresses, don't assume it's aligned on a 32-bit boundary - to get it in host byte order, fetch it with pntoh32(), which fetches a 32-bit value that's in network byte order, and isn't necessarily aligned on any particular boundary, and returns it in host byte order. Change-Id: Ic512ab4b1e0f2815d9f0af0e33714f456a08a45d Reviewed-on: https://code.wireshark.org/review/25589 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-03mqtt: Put msgid and topic in Info columnStig Bjørlykke1-7/+19
Change-Id: If6e149f21a9c8bd122daa6d751f72b8d8c0454ff Reviewed-on: https://code.wireshark.org/review/25578 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-03dmp: fix memleaksJakub Zawadzki1-2/+2
dmp_long_id_hash_table is wmem_map autoreset on file scope. Don't put there g_strdup() data. Valgrind log: ==15134== 8 bytes in 2 blocks are definitely lost in loss record 3,988 of 49,961 ==15134== at 0x4C29C4F: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==15134== by 0xA94E405: g_malloc (gmem.c:97) ==15134== by 0xA966C4E: g_strdup (gstrfuncs.c:356) ==15134== by 0x6CFC301: dissect_mts_identifier (packet-dmp.c:2684) ==15134== by 0x6D01A8F: dissect_dmp_envelope (packet-dmp.c:2935) ==15134== by 0x6D01A8F: dissect_dmp (packet-dmp.c:3909) Found by oss-fuzz. Change-Id: I7c3896a9b64c25035fbe8b4ef6130cd693a515db Reviewed-on: https://code.wireshark.org/review/25575 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2018-02-03CIP Motion: Support Format Revision 3Dylan Ulis5-67/+95
See Volume 9, version 1.2, sections "6-2.7.1.1" and "7-1.1" 1. Pass Connection Point from FwdOpen to Motion dissector, since that is now needed to parse I/O payload. 2. Move Run/Idle Header function to CIP dissector, since it's a CIP feature, not ENIP. 3. Add a protocol so that Format Revision 3 can be dissected without the Forward Open in the capture. 4. Minor: Highlight more bytes in some EPATH parsing. 5. Minor: Renaming some things to match spec wording. Change-Id: I93626a6492be2675206d38c04fa1c7ce534c04ca Reviewed-on: https://code.wireshark.org/review/25570 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-02quic: fix secret memleaks.Jakub Zawadzki3-3/+7
It looks like that quic_create_cleartext_decoders() need to free secrets, tls13_cipher_create() only use it as const. ASAN report: ERROR: LeakSanitizer: detected memory leaks Direct leak of 32 byte(s) in 1 object(s) allocated from: #0 0x4e26e8 in __interceptor_malloc /src/llvm/projects/compiler-rt/lib/asan/asan_malloc_linux.cc:88 #1 0x225b038 in g_malloc #2 0x1742014 in quic_derive_cleartext_secrets /src/wireshark/epan/dissectors/packet-quic.c:1071:10 #3 0x173e579 in quic_create_cleartext_decoders /src/wireshark/epan/dissectors/packet-quic.c:1091:10 #4 0x173dc89 in dissect_quic_long_header /src/wireshark/epan/dissectors/packet-quic.c:1221:14 #5 0x173ced6 in dissect_quic /src/wireshark/epan/dissectors/packet-quic.c:1402:18 (...) Direct leak of 32 byte(s) in 1 object(s) allocated from: #0 0x4e26e8 in __interceptor_malloc /src/llvm/projects/compiler-rt/lib/asan/asan_malloc_linux.cc:88 #1 0x225b038 in g_malloc #2 0x1741fd5 in quic_derive_cleartext_secrets /src/wireshark/epan/dissectors/packet-quic.c:1065:10 #3 0x173e579 in quic_create_cleartext_decoders /src/wireshark/epan/dissectors/packet-quic.c:1091:10 #4 0x173dc89 in dissect_quic_long_header /src/wireshark/epan/dissectors/packet-quic.c:1221:14 #5 0x173ced6 in dissect_quic /src/wireshark/epan/dissectors/packet-quic.c:1402:18 (...) Found by oss-fuzz/5902. Change-Id: I6f8a4597411ee267773225e45043addb69928d66 Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=5902 Reviewed-on: https://code.wireshark.org/review/25571 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-02-02epl: fix map.title memleak.Jakub Zawadzki1-4/+4
Valgrind report: ==642== 14 bytes in 1 blocks are definitely lost in loss record 5,705 of 49,814 ==642== by 0xA966DCC: g_strdup_vprintf (gstrfuncs.c:507) ==642== by 0xA966E88: g_strdup_printf (gstrfuncs.c:533) ==642== by 0x6D523F4: dissect_object_mapping (packet-epl.c:4216) ==642== by 0x6D56394: dissect_epl_sdo_command (packet-epl.c:3862) ==642== by 0x6D56394: dissect_epl_asnd_sdo (packet-epl.c:3572) ==642== by 0x6D59BC5: dissect_epl_asnd (packet-epl.c:3053) ==642== by 0x6D59BC5: dissect_eplpdu.part.21 (packet-epl.c:2627) Found by oss-fuzz/5907. Change-Id: I6f4d2cea761581260af396c848ab1fded5641b44 Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=5907 Reviewed-on: https://code.wireshark.org/review/25573 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-02-02packet-mq: Add support for IMS+TM StructDario Lombardo4-717/+891
Added support for IMS, TM, TMC2 Struct Improve display some Flags in ID Struct Fix display for FCNO Struct Fix error in get_mq_pdu_len Code reformat (VS2017) Moved DEFINE to header file More struct display fixed Fix for IMS Msg len display Change-Id: I80bfd25a5079598fc44124dc2c7b850640a38b00 Reviewed-on: https://code.wireshark.org/review/25295 Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-02SoupBinTCP: Remove try_conversation_dissector callMichael Mann1-16/+0
As stated in the #if 0ed out comments, It's not valid for a soupbintcp subdissector to call conversation_set_dissector(), so it shouldn't call try_conversation_dissector. Just remove the call entirely so it doesn't look like the removal is temporary. Change-Id: I68d9b72360b52002692c369d7b202a8a215c0a96 Reviewed-on: https://code.wireshark.org/review/25555 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-01RTP: ensure that bta2dp_info and btvdp_info are always initializedPascal Quantin1-2/+5
Bug: 14380 Change-Id: Ib691b067f25d7281be2f6b4387552252d16d0064 Reviewed-on: https://code.wireshark.org/review/25550 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-01Fix endianness of CAN-ETH CAN packetLazar Sumar1-2/+1
The CAN-ETH protocol explicitly states that the CAN identifiers are transmitted in little-endian order, and the dissector now decodes it as little-endian rather than host-endian. Change-Id: I92c44b809caace31726e0d355363355eb32efa3e Reviewed-on: https://code.wireshark.org/review/25549 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-01json: Adjust whitespaceStig Bjørlykke1-11/+9
Change-Id: Ifa10ca415d291ab6b0cb06c475ac8697b5fc96da Reviewed-on: https://code.wireshark.org/review/25548 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-01TDS: ensure to always initialize tds_encoding_char even when protocol is unknownPascal Quantin1-17/+3
Otherwise we use an uninitialized variable Bug: 14372 Change-Id: Idacdb40569421f7e41e181c14fb2bc033b0645b8 Reviewed-on: https://code.wireshark.org/review/25529 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-01New dissector Session Multiplex Protocol SMPUli Heilmeier4-7/+302
Adding Session Multiplex Protocol SMP SMP is used by TDS when MARS in enabled. Bug: 14110 Change-Id: Ia4113c627d107da6c3d51e4004265efb228a297b Reviewed-on: https://code.wireshark.org/review/25509 Reviewed-by: Craig Jackson <cejackson51@gmail.com> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-01bacapp: make sure to NUL terminate bf_arr.Jakub Zawadzki1-3/+3
bf_arr is used as %s argument to proto_tree_add_subtree_format(), so it need to be NUL terminated. Add + 1 to bf_arr size, and use sizeof() in memset() calls. ASAN report: ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7ff1b179f150 at pc 0x00000044cf31 bp 0x7ffdc7493cf0 sp 0x7ffdc74934a0 READ of size 258 at 0x7ff1b179f150 thread T0 SCARINESS: 41 (multi-byte-read-stack-buffer-overflow) #0 0x44cf30 in printf_common(void*, char const*, __va_list_tag*) /src/llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_format.inc:548 #1 0x498cfc in __vsnprintf_chk /src/llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc:1558 #2 0x5775cf in proto_tree_set_representation /src/wireshark/epan/proto.c:5508:9 #3 0x577eb1 in proto_tree_add_text_valist_internal /src/wireshark/epan/proto.c:1226:2 #4 0x5782d5 in proto_tree_add_subtree_format /src/wireshark/epan/proto.c:1249:7 #5 0x73c73f in fBitStringTagVS /src/wireshark/epan/dissectors/packet-bacapp.c:7490:15 #6 0x73ad20 in fApplicationTypesEnumeratedSplit /src/wireshark/epan/dissectors/packet-bacapp.c:7569:26 #7 0x73a484 in fApplicationTypes /src/wireshark/epan/dissectors/packet-bacapp.c:7635:12 #8 0x7395db in fIAmRequest /src/wireshark/epan/dissectors/packet-bacapp.c:13412:14 #9 0x7383e1 in dissect_bacapp /src/wireshark/epan/dissectors/packet-bacapp.c:14163:9 Found by oss-fuzz/5452. Change-Id: I57e948904f707c5003a389431b009a37c1212e04 Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=5452 Reviewed-on: https://code.wireshark.org/review/25544 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2018-01-31ieee80211: various fixes to the 802.11ax support.Adrian Granados1-59/+57
Fixes/improves a few filter identifiers, typos, consistent use of MHz (as opposed to Mhz), and fixes to the MCS map trees in the HE Capabilities tag. Change-Id: I5c761990237ccc241d95fb0b9b2d3f8f1263b460 Reviewed-on: https://code.wireshark.org/review/25530 Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com> Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com> Tested-by: Petri Dish Buildbot
2018-01-31IAX2: always initialize src_vformat and dst_vformatPascal Quantin1-0/+2
Bug: 14371 Change-Id: Icc027151fafd6db6ef8be18c9fc2ccf39518907f Reviewed-on: https://code.wireshark.org/review/25531 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-01-31[MEGACO] Clear megaco_command between commands.AndersBroman1-0/+1
Change-Id: I62b9c9e192a6d5079c183a5b2e3ca7fa82c5bf39 Reviewed-on: https://code.wireshark.org/review/25528 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-31hsrp: Fix UDP port number for HSRPv6Stig Bjørlykke1-1/+1
The UDP port for HSRPv6 was mistyped when UDP dissectors was converted to use "auto" preferences in g2eb7b05b8c. Change-Id: I4b6f634677d23d81fc197dbeb43ee3d91d9a111f Reviewed-on: https://code.wireshark.org/review/25526 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-01-30ieee1905: add missing NULL terminatator to ieee1905_reporting_policy_flags[].Jakub Zawadzki1-1/+2
Add missing NULL terminator to ieee1905_reporting_policy_flags[], in order to fix buffer overflow. ASAN report: ERROR: AddressSanitizer: global-buffer-overflow on address 0x0000092a4af8 at pc 0x00000062afd2 bp 0x7ffce7e468d0 sp 0x7ffce7e468c8 READ of size 8 at 0x0000092a4af8 thread T0 #0 0x62afd1 in proto_item_add_bitmask_tree /src/wireshark/epan/proto.c:10406:9 #1 0x62953f in proto_tree_add_bitmask_with_flags /src/wireshark/epan/proto.c:10786:3 #2 0xfb8271 in dissect_metric_reporting_policy /src/wireshark/epan/dissectors/packet-ieee1905.c:2762:9 #3 0xfb2997 in dissect_ieee1905_tlv_data /src/wireshark/epan/dissectors/packet-ieee1905.c:4390:18 #4 0xfb23c8 in dissect_ieee1905 /src/wireshark/epan/dissectors/packet-ieee1905.c:4577:18 Found by oss-fuzz/5298. Change-Id: I35dbd6d29d0a3a5560286146fbed172c810e5b2d Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=5298 Reviewed-on: https://code.wireshark.org/review/25520 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2018-01-30radiotap: Refactor some aspects of the radiotap dissector.Richard Sharpe1-448/+514
One thing I hate is big slabs of open coding. Compilers are very good these days and will inline functions if they are used in only one place. By using functions we make the code very much more readible. There is also a big opportunity to use functions like proto_tree_add_bitmask. Change-Id: I66d1509f577d2955996f4649e05494ab0370ed01 Reviewed-on: https://code.wireshark.org/review/24964 Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-30SIP: Fixed matching of INVITE request to INVITE response.Robert Jongbloed1-7/+7
The sip_is_packet_resend() function sets the internal transaction_state to final_response_seen, the prevents the sip_find_request() from finding the matching INVITE as it expects transaction_state == request_seen. Simply reversing the order of these functions seems to fix the problem. Change-Id: I61d085c979dee24ad88b4eea26dfa002fd9cd213 Reviewed-on: https://code.wireshark.org/review/25429 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 14:04:36 +0000