[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.0rc1-25-gf9213d7

[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  f9213d7cc67cacef6b234fb105a08806f7f394ad (commit)
       via  7e38347d995c401a375c8f6160566784465b7873 (commit)
       via  9442dce451d2ffa1d1e87e6c4a10990b1e02d0fe (commit)
       via  9f2ce16ef369805f7ce03c4e33b2eb234220b681 (commit)
       via  e381af98dd2fd1699e6c88bdee4dea00367dbe96 (commit)
      from  3c9a135c0f2cab5df1942f0e52d206d4f7ed1e1f (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 f9213d7cc67cacef6b234fb105a08806f7f394ad
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Feb 26 15:18:26 2014 +0100

    stream-tcp: proper error if segment pool init fails
    
    Until now a PoolInit failure for the segment pools would result in
    an abort() through BUG_ON(). This patch adds a proper error message,
    then exits.
    
    Bug #1108.

commit 7e38347d995c401a375c8f6160566784465b7873
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Feb 26 15:14:14 2014 +0100

    stream-tcp: fix error handling in segment pool
    
    When TcpSegmentPoolInit fails (e.g. because of a too low memcap),
    it would free the segment. However, the segment memory is managed
    by the Pool API, which would also free the same memory location.
    This patch fixes that.
    
    Also, memset the structure before any checks are done, as the segment
    memory is passed to TcpSegmentPoolCleanup in case of error as well.
    
    Bug #1108

commit 9442dce451d2ffa1d1e87e6c4a10990b1e02d0fe
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Feb 26 12:41:15 2014 +0100

    commandline parsing: check optarg ptr before using it
    
    Fixes:
    ** CID 1075221:  Dereference after null check  (FORWARD_NULL)
    /src/suricata.c: 1344 in ParseCommandLine()
    
    The reason it gave this warning is that in other paths using optarg
    there was a check, so the checker assumed optarg can be NULL.

commit 9f2ce16ef369805f7ce03c4e33b2eb234220b681
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Feb 26 12:21:24 2014 +0100

    icmpv6: Fix Coverity warnings on ND_* types
    
    This patch fixes:
    ** CID 1187544:  Missing break in switch  (MISSING_BREAK)
    /src/decode-icmpv6.c: 268 in DecodeICMPV6()
    
    ** CID 1187545:  Missing break in switch  (MISSING_BREAK)
    /src/decode-icmpv6.c: 270 in DecodeICMPV6()
    
    ** CID 1187546:  Missing break in switch  (MISSING_BREAK)
    /src/decode-icmpv6.c: 272 in DecodeICMPV6()
    
    ** CID 1187547:  Missing break in switch  (MISSING_BREAK)
    /src/decode-icmpv6.c: 274 in DecodeICMPV6()
    
    It duplicates the logic instead of adding 'fall through' statements
    as the debug statements were wrong and confusing. For ND_REDIRECT
    all 5 ND_* types would have been printed.

commit e381af98dd2fd1699e6c88bdee4dea00367dbe96
Author: Ken Steele <ken at tilera.com>
Date:   Fri Feb 21 16:03:57 2014 -0500

    Only update mPipe stats occasionally around the packet loop.
    
    Check for termination or stats update only once every 10,000 times
    around the mPipe packet processing loop, to reduce locking.

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

Summary of changes:
 src/decode-icmpv6.c         |   18 ++++++++++++++++--
 src/source-mpipe.c          |   17 ++++++++++++-----
 src/stream-tcp-reassemble.c |   15 ++++++++++-----
 src/suricata.c              |   24 +++++++++++++-----------
 4 files changed, 51 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
OISF