[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.0-47-gfc559ce

[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  fc559ce227d4254840b5f1241d5408c52879ce8c (commit)
       via  b6e2a6f5255cd98d98f9e5dceb934d1ad5b3e434 (commit)
       via  cf31e2cc74da5280b2be64f79db8e8f78acf18a6 (commit)
       via  5e1bc99e5be467c918d3eeecd8863789ea52ce9c (commit)
       via  6e0112d7378f4879e41448068e2366e05a3cefb3 (commit)
      from  43b6cbd4bc76e423f9d52d63d5d4a60e864eedb3 (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 fc559ce227d4254840b5f1241d5408c52879ce8c
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Apr 15 12:39:22 2014 +0200

    detect: fix alstate handling
    
    Previously, the alstate use in the main detect loop was unsafe. The
    alstate pointer would be set duing a lock, but it would again be used
    after one or more lock/unlock cycles. If the data pointed to would
    disappear, a dangling pointer would be the result.
    
    Due to they way flows are cleaned up using reference counting and
    such, changes of this happening were very small. However, at least
    one path can lead to this situation. So it had to be fixed.

commit b6e2a6f5255cd98d98f9e5dceb934d1ad5b3e434
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Apr 15 12:23:21 2014 +0200

    detect: locking update continued
    
    Make DeStateDetectContinueDetection get it's own alstate pointer instead
    of using the one that was passed to it. We now get and use it only
    inside a flow lock.

commit cf31e2cc74da5280b2be64f79db8e8f78acf18a6
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Apr 15 11:18:47 2014 +0200

    detect: locking update
    
    Make DeStateDetectStartDetection get it's own alstate pointer instead
    of using the one that was passed to it. We now get and use it only
    inside a flow lock.

commit 5e1bc99e5be467c918d3eeecd8863789ea52ce9c
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Apr 15 11:05:17 2014 +0200

    detect: cleanup
    
    Remove unused alstate and app layer flags arguments from
    DetectEngineInspectPacketPayload()

commit 6e0112d7378f4879e41448068e2366e05a3cefb3
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Apr 15 10:31:48 2014 +0200

    detect: modify AMATCH locking
    
    This is an intrusive change. This patch modifies the way AMATCH
    inspection uses locking.
    
    So far, each keyword did it's own locking. This lead to a situation
    where a 'alstate' pointer was passed around that was not always
    protected by a lock.
    
    This patch moves the locking to the Stateful detection functions.

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

Summary of changes:
 src/detect-app-layer-event.c      |    3 -
 src/detect-app-layer-protocol.c   |    2 -
 src/detect-dce-iface.c            |    3 -
 src/detect-engine-payload.c       |    5 +-
 src/detect-engine-payload.h       |    3 +-
 src/detect-engine-state.c         |  147 +++++++++++++++++++++++++------------
 src/detect-engine-state.h         |    7 +-
 src/detect-ftpbounce.c            |    2 -
 src/detect-ssh-proto-version.c    |    2 -
 src/detect-ssh-software-version.c |    2 -
 src/detect-ssl-state.c            |    3 -
 src/detect-ssl-version.c          |    4 -
 src/detect-tls-version.c          |    2 -
 src/detect-tls.c                  |   12 +--
 src/detect.c                      |   72 +++++++++++-------
 15 files changed, 151 insertions(+), 118 deletions(-)


hooks/post-receive
-- 
OISF