Wireshark · Wireshark-commits: [Wireshark-commits] master-2.2 f05c3b9: VLAN: define a recursion depth limit

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f05c3b91f9571210b86576ee6284e71a3306109d
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

f05c3b9 by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    VLAN: define a recursion depth limit
    
    Altough the dissection consumes 4 bytes each time it is called, it can
    trigger a stack overflow for big packets. Let's limmit the number of
    allowed VLAN tags for a given packet.
    
    Bug: 14469
    Change-Id: Ieb6834ab3350dc7e8c301e6479577855a253897e
    Reviewed-on: https://code.wireshark.org/review/26270
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    (cherry picked from commit b434e0a03be45ed796af7271972672a0b43cffa8)
    Conflicts:
    	epan/dissectors/packet-vlan.c
    Reviewed-on: https://code.wireshark.org/review/26274
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    

Actions performed:

    from  66bc372   NBAP: avoid linking a DCH-ID to itself
    adds  f05c3b9   VLAN: define a recursion depth limit


Summary of changes:
 epan/dissectors/packet-vlan.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)