Wireshark-commits: [Wireshark-commits] master 177962a: enip: use wmem for copied addresses
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: Sun, 04 Mar 2018 07:49:06 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=177962a5b4a05759b40fb6fc07a4a6eec306a9bf
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

177962a by Martin Kaiser (wireshark@xxxxxxxxx):

    enip: use wmem for copied addresses
    
    When we copy an address from pinfo into connInfo->O2T.ipaddress, a
    shallow copy is not sufficient. connInfo->O2T.ipaddress is kept across
    packets whereas pinfo is valid only for the current packet.
    
    Use wmem with file scope for the copied address. This fixes a
    use-after-free error when we access the address in a subsequent packet.
    
    Bug: 14470
    Change-Id: I8b74037020189485485a506af6510cb45828e3c4
    Reviewed-on: https://code.wireshark.org/review/26248
    Reviewed-by: Martin Kaiser <wireshark@xxxxxxxxx>
    Petri-Dish: Martin Kaiser <wireshark@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  b70eb18   mmse: remove a ton of if (tree) checks
    adds  177962a   enip: use wmem for copied addresses


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