aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-nsh.c
AgeCommit message (Collapse)AuthorFilesLines
2017-05-05nsh: fix stack overflow due to missing length checksPeter Wu1-46/+75
After v2.3.0rc0-3167-ge6f944d632, the NSH dissector could call itself recursively and since the minimum header length was not validated, it could result in a stack overflow due to infinite recursion. Add checks based on the text from https://tools.ietf.org/html/draft-ietf-sfc-nsh-12#section-3.2 This patch also fixes a regression since v2.3.0rc0-3171-g2273cf0e7b where the wrong tvb was passed to subdissectors. Tested with the two captures from bug 11490. Bug: 13612 Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1156 Change-Id: I8cacfa267557e8373ff8134f4b020d927e37842f Reviewed-on: https://code.wireshark.org/review/21499 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-04-17packet-nsh.c: Create dissector table for next protocolMichael Mann1-71/+29
Change-Id: Id8be2a37f99f4ac9d531a694273c7d5d3f843cc1 Reviewed-on: https://code.wireshark.org/review/21163 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2017-04-17nsh: add support for nsh/nsh, and nsh/mplsGabriel Ganne1-6/+21
Change-Id: If7c8d703c3a019af75ef24d3813bfe64a9db2471 Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com> Reviewed-on: https://code.wireshark.org/review/21161 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-08nsh: remove duplicate ethertype entryGabriel Ganne1-1/+2
Change-Id: I3b177eb86a4058a437f9fb0617b5ae5b3a513af2 Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com> Reviewed-on: https://code.wireshark.org/review/20447 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-07nsh: add protocol dissection over ethernetGabriel Ganne1-2/+1
Change-Id: I4cbfb5d4371fa4401f591d5e52a603ae1256c23c Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com> Reviewed-on: https://code.wireshark.org/review/20435 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-31Support for NSH with Ethernet encapsulationJaime Caamaño Ruiz1-0/+1
Change-Id: I88bc4924add4d89c1386cb1be9d27233cef861f1 Reviewed-on: https://code.wireshark.org/review/19867 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-19VXLAN: use the newly created vxlan.next_proto dissector table everywherePascal Quantin1-1/+1
Change-Id: Ib6f44e0f1d3d8c76d2b6e6c778af8c243af4389c Reviewed-on: https://code.wireshark.org/review/16543 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-19Support for NSH with VXLAN encapsulationsjha31-0/+5
Bug: 12271 Change-Id: Ia6d999049d56a4828936c95e272524e47d84bf8f Reviewed-on: https://code.wireshark.org/review/16517 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-03Revert "Support for NSH with VXLAN-GPE encapsulation"Alexis La Goutte1-4/+0
This reverts commit 76a8bca9bc87823e9182fa6ebb35f0b93bcc451b. Change-Id: I85b9778329373872e4f9fd1b90280dfef5e33a06 Reviewed-on: https://code.wireshark.org/review/16255 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-03Support for NSH with VXLAN-GPE encapsulationsjha31-0/+4
Bug: 12271 Change-Id: I8481c4ab69c4432985acc79bff7818e6857fa1cb Reviewed-on: https://code.wireshark.org/review/16251 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-16NSH: Correct the display of the NSH header fieldsThomas Shen1-4/+4
Change-Id: I3be75d20a3f00091aa3077e475f9ddb00eeca06c Reviewed-on: https://code.wireshark.org/review/15963 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-20Manually add protocol dependencies derived from find_dissector.Michael Mann1-3/+3
Started by grepping call_dissector_with_data, call_dissector_only and call_dissector and traced the handles passed into them to a find_dissector within the dissector. Then replaced find_dissector with find_dissector_add_dependency and added the protocol id from the dissector. "data" dissector was not considered to be a dependency. Change-Id: I15d0d77301306587ef8e7af5876e74231816890d Reviewed-on: https://code.wireshark.org/review/14509 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-26packet-nsh.c - Look for correct ethernet dissector name.Michael Mann1-1/+1
Bug: 12180 Change-Id: If089ad49a27de2a681490ef75aaa9a7b7e5ad922 Reviewed-on: https://code.wireshark.org/review/14184 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-05Network Service Header Dissector for Ethernet & GRE encapsulationChidambaram Arunachalam1-0/+382
draft-ietf-sfc-nsh-01.txt Bug: 11490 Change-Id: I95adb1e0b1e42ba8c75e82145a756e2836a9a989 Reviewed-on: https://code.wireshark.org/review/13633 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 20:24:57 +0000