Wireshark-commits: [Wireshark-commits] master-2.4 7929700: VLAN: define a recursion depth limit
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 06 Mar 2018 08:46:48 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7929700033eb41fc49fc637ec039ad0a262443e3
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-2.4
Repository: wireshark

Commits:

7929700 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)
    Reviewed-on: https://code.wireshark.org/review/26272
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    

Actions performed:

    from  1c9adc6   NBAP: avoid linking a DCH-ID to itself
    adds  7929700   VLAN: define a recursion depth limit


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