[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-3.0.1-106-g50b33ad

[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  50b33ad5082e4947f8e5996c15b57958b2417b1b (commit)
       via  38f67d88ea996e6af00398deb8facb5e7c2b4a05 (commit)
       via  7ef8558e79d1a2b2c9155599676d16a2db7f632b (commit)
       via  d085362e610f1a64e08132d40890c791757c28e5 (commit)
       via  dc008206e346ea339af8a2e3c600eafe98ac187f (commit)
       via  2ee3e726a9f4f5b68213a68dda82599d8523db22 (commit)
      from  9b6e292a28ac862684056f8dee912f0629590cbf (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 50b33ad5082e4947f8e5996c15b57958b2417b1b
Author: Eric Leblond <eric at regit.org>
Date:   Thu Mar 31 10:22:11 2016 +0200

    prscript: update logic of sync with master test
    
    Code now get master sha on github and check if it is in current
    branch with a git command. It also sync first that the current
    local branch is in sync with github corresponding branch.
    
    Signed-off-by: Eric Leblond <eric at regit.org>

commit 38f67d88ea996e6af00398deb8facb5e7c2b4a05
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Dec 16 13:10:05 2015 +0100

    tcp: reduce TCP options storage in packets
    
    Until now, the TCP options would all be stored in the Packet structure.
    The commonly used ones (wscale, ts, sack, sackok and mss*) then had a
    pointer to the position in the option array. Overall this option array
    was large. About 360 bytes on 64bit systems. Since no part of the engine
    would every access this array other than through the common short cuts,
    this was actually just wasteful.
    
    This patch changes the approach. It stores just the common ones in the
    packet. The rest is gone. This shrinks the packet structure with almost
    300 bytes.
    
    * even though mss wasn't actually used

commit 7ef8558e79d1a2b2c9155599676d16a2db7f632b
Author: Torgeir Natvig <torgeir.natvig at gmail.com>
Date:   Wed Apr 6 16:08:39 2016 +0200

    lua_close() segfaults on null pointers

commit d085362e610f1a64e08132d40890c791757c28e5
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Apr 5 13:14:03 2016 +0200

    detect: fix error handling in mpm setup
    
    *** CID 1358124:  Null pointer dereferences  (REVERSE_INULL)
    /src/detect-engine-mpm.c: 940 in MpmStoreSetup()
    934                     PopulateMpmHelperAddPatternToPktCtx(ms->mpm_ctx,
    935                             cd, s, 0, (cd->flags & DETECT_CONTENT_FAST_PATTERN_CHOP));
    936                 }
    937             }
    938         }
    939
    >>>     CID 1358124:  Null pointer dereferences  (REVERSE_INULL)
    >>>     Null-checking "ms->mpm_ctx" suggests that it may be null, but it has already been dereferenced on all paths leading to the check.
    940         if (ms->mpm_ctx != NULL) {
    941             if (ms->mpm_ctx->pattern_cnt == 0) {
    942                 MpmFactoryReClaimMpmCtx(de_ctx, ms->mpm_ctx);
    943                 ms->mpm_ctx = NULL;
    944             } else {
    945                 if (ms->sgh_mpm_context == MPM_CTX_FACTORY_UNIQUE_CONTEXT) {

commit dc008206e346ea339af8a2e3c600eafe98ac187f
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Apr 5 13:05:08 2016 +0200

    detect: fix scan-build warning
    
    detect-engine-siggroup.c:700:38: warning: Call to 'malloc' has an allocation size of 0 bytes
        sgh->non_mpm_other_store_array = SCMalloc(non_mpm * sizeof(SignatureNonMpmStore));
                                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    ./util-mem.h:177:14: note: expanded from macro 'SCMalloc'
        ptrmem = malloc((a)); \
                 ^~~~~~~~~~~
    1 warning generated.

commit 2ee3e726a9f4f5b68213a68dda82599d8523db22
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Apr 5 12:59:54 2016 +0200

    detect: don't set unused variable
    
    detect.c:3801:13: warning: Value stored to 'tmplist2_tail' is never read
                tmplist2_tail = joingr;
                ^               ~~~~~~
    detect.c:3804:13: warning: Value stored to 'tmplist2_tail' is never read
                tmplist2_tail = joingr;
                ^               ~~~~~~
    2 warnings generated.

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

Summary of changes:
 qa/prscript.py               | 57 ++++++++++++++++++++++++++++---------
 src/decode-tcp.c             | 68 +++++++++++++++++++++++++-------------------
 src/decode-tcp.h             | 49 +++++++++++++++----------------
 src/detect-engine-mpm.c      | 19 +++++++------
 src/detect-engine-siggroup.c | 18 ++++++++----
 src/detect.c                 |  4 +--
 src/output-lua.c             |  6 ++--
 src/stream-tcp.c             | 62 ++++++++++++++++------------------------
 8 files changed, 158 insertions(+), 125 deletions(-)


hooks/post-receive
-- 
OISF