Wireshark-commits: [Wireshark-commits] master-2.0 53f7f28: isakmp Fix IKEv2 modification UAT crash

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 24 Aug 2016 12:46:21 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=53f7f28abfe6bff2f16bd96737bb9200072bd460
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

53f7f28 by Michał Skalski (mskalski13@xxxxxxxxx):

    isakmp Fix IKEv2 modification UAT crash
    
    Problem is that not all fields of UAT are updated on change (only those
    defined in UAT definition with ikev2_uat_flds, specifically pointers to
    encr_spec and auth_spec in ike2_decr_data_t were set to NULL.
    
    Fixed by re-setting pointers after update table callback was called.
    
    Also fixed memory leaks after UAT modification.
    
    Bug was partially resolved with change
    Ibdab979b5959eb561635cbcb446e17138baca87b
    https://code.wireshark.org/review/17078
    
    which eliminated crash, but decryption still didn't work after UAT
    modification (DISSECTOR BUG was displayed).
    
    Bug: 12748
    Change-Id: I8209edd8e214d62e34b641fdd2e046b9ff4c95eb
    Reviewed-on: https://code.wireshark.org/review/17249
    Reviewed-by: Jaap Keuter <jaap.keuter@xxxxxxxxx>
    Petri-Dish: Jaap Keuter <jaap.keuter@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    (cherry picked from commit 505bcefd20501ae0811f6074f2113b52788d78c5)
    Conflicts:
    	epan/dissectors/packet-isakmp.c
    Reviewed-on: https://code.wireshark.org/review/17303
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    

Actions performed:

    from  504373f   SCSI: Mode Sense 10: Wrong block descriptor length
    adds  53f7f28   isakmp Fix IKEv2 modification UAT crash


Summary of changes:
 epan/dissectors/packet-isakmp.c |    4 ++++
 1 file changed, 4 insertions(+)