[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-3.2beta1-80-g7e54ee7

[OISF Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OISF".

The branch, master has been updated
       via  7e54ee7d0e7dac51c7436724961fdba78af85561 (commit)
       via  d1d618a668df1337cf1be268c640f5687f93fc6f (commit)
       via  368d5d931c702e3606d139e08dea0fd4d82aa5b4 (commit)
      from  1aa70fb39e5581956cef99cc4ac3daef80e0454e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7e54ee7d0e7dac51c7436724961fdba78af85561
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Oct 19 12:52:46 2016 +0200

    flow-timeout: fix memory errors on flow bypass
    
    For flow bypass, the flow timeout handling is triggered which may
    create up to 3 pseudo packets that hold a reference to the flow.
    However, in the bypass case the code signaled to the timeout logic
    that the flow can be freed unconditionally by returning 1. This
    lead to packets going through the engine with a pointer to a now
    freed/recycled flow.
    
    This patch fixes the logic by removing the special bypass case,
    which seemed redundant anyway. Effectively reverts 68d9677.
    
    Bug #1928.

commit d1d618a668df1337cf1be268c640f5687f93fc6f
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Oct 19 12:50:47 2016 +0200

    flow-manager: cleanups and comment improvements

commit 368d5d931c702e3606d139e08dea0fd4d82aa5b4
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Oct 19 11:11:10 2016 +0200

    flow-timeout: don't leak flow reference in error path

-----------------------------------------------------------------------

Summary of changes:
 src/flow-manager.c | 19 +++----------------
 src/flow-timeout.c |  8 ++++++--
 2 files changed, 9 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
OISF