[Oisf-devel] [COMMIT] OISF branch, master-2.0.x, updated. suricata-2.0.9

[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-2.0.x has been updated
       via  727274da0cb45ac71e1bf65dbc1c9f5b7f83db97 (commit)
       via  d7b0ec8c91600811b246f79b5ffbcb498aef2c7a (commit)
       via  7ab5fc34b3f14ee829cf4c7a164c4b12b2d0f673 (commit)
       via  83e6f924fb2d536d05ac728be5cf711544c67cd8 (commit)
       via  f9a6bcc611c5096826eae076363f81d7db77a31b (commit)
       via  d778b83d40eb76207cd6d90b3c3095e2246722ec (commit)
       via  963f30b1149bbfc68fde58203e937829f0dd2b06 (commit)
       via  162887cfbf02cfa339ff295376d40a71d9b70d7d (commit)
      from  21689eec931d63a7324df68fed717bed50dcd8de (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 727274da0cb45ac71e1bf65dbc1c9f5b7f83db97
Author: Victor Julien <victor at inliniac.net>
Date:   Fri Sep 25 16:17:30 2015 +0200

    changelog: update for 2.0.9

commit d7b0ec8c91600811b246f79b5ffbcb498aef2c7a
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Sep 22 15:20:25 2015 +0200

    Fix two more potential issues like bug 1550

commit 7ab5fc34b3f14ee829cf4c7a164c4b12b2d0f673
Author: Alessandro Guido <alessandro.guido at unimore.it>
Date:   Wed Sep 16 15:14:11 2015 +0200

    Segfault fix

commit 83e6f924fb2d536d05ac728be5cf711544c67cd8
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Sep 24 12:24:15 2015 +0200

    defrag tests: fix compiler warnings
    
    defrag.c:2423:9: error: variable 'p' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized]
        if (p1 == NULL || p2 == NULL || p3 == NULL) {
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    defrag.c:2460:9: note: uninitialized use occurs here
        if (p != NULL) {
            ^
    defrag.c:2423:5: note: remove the 'if' if its condition is always false
        if (p1 == NULL || p2 == NULL || p3 == NULL) {
        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    defrag.c:2423:9: error: variable 'p' is used uninitialized whenever '||' condition is true [-Werror,-Wsometimes-uninitialized]
        if (p1 == NULL || p2 == NULL || p3 == NULL) {
            ^~~~~~~~~~~~~~~~~~~~~~~~
    defrag.c:2460:9: note: uninitialized use occurs here
        if (p != NULL) {
            ^
    defrag.c:2423:9: note: remove the '||' if its condition is always false
        if (p1 == NULL || p2 == NULL || p3 == NULL) {
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~
    defrag.c:2423:9: error: variable 'p' is used uninitialized whenever '||' condition is true [-Werror,-Wsometimes-uninitialized]
        if (p1 == NULL || p2 == NULL || p3 == NULL) {
            ^~~~~~~~~~
    defrag.c:2460:9: note: uninitialized use occurs here
        if (p != NULL) {
            ^
    defrag.c:2423:9: note: remove the '||' if its condition is always false
        if (p1 == NULL || p2 == NULL || p3 == NULL) {
            ^~~~~~~~~~~~~
    defrag.c:2427:5: note: variable 'p' is declared here
        Packet *p = Defrag(NULL, NULL, p1, NULL);
        ^
    defrag.c:2486:9: error: variable 'p' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized]
        if (p1 == NULL || p2 == NULL || p3 == NULL) {
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    defrag.c:2523:9: note: uninitialized use occurs here
        if (p != NULL) {
            ^
    defrag.c:2486:5: note: remove the 'if' if its condition is always false
        if (p1 == NULL || p2 == NULL || p3 == NULL) {
        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    defrag.c:2486:9: error: variable 'p' is used uninitialized whenever '||' condition is true [-Werror,-Wsometimes-uninitialized]
        if (p1 == NULL || p2 == NULL || p3 == NULL) {
            ^~~~~~~~~~~~~~~~~~~~~~~~
    defrag.c:2523:9: note: uninitialized use occurs here
        if (p != NULL) {
            ^
    defrag.c:2486:9: note: remove the '||' if its condition is always false
        if (p1 == NULL || p2 == NULL || p3 == NULL) {
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~
    defrag.c:2486:9: error: variable 'p' is used uninitialized whenever '||' condition is true [-Werror,-Wsometimes-uninitialized]
        if (p1 == NULL || p2 == NULL || p3 == NULL) {
            ^~~~~~~~~~
    defrag.c:2523:9: note: uninitialized use occurs here
        if (p != NULL) {
            ^
    defrag.c:2486:9: note: remove the '||' if its condition is always false
        if (p1 == NULL || p2 == NULL || p3 == NULL) {
            ^~~~~~~~~~~~~
    defrag.c:2490:5: note: variable 'p' is declared here
        Packet *p = Defrag(NULL, NULL, p1, NULL);
        ^
    6 errors generated.
    make[3]: *** [defrag.o] Error 1

commit f9a6bcc611c5096826eae076363f81d7db77a31b
Author: Jason Ish <ish at unx.ca>
Date:   Thu Aug 27 13:59:30 2015 -0600

    defrag: stop reassembly at the first packet with more flags not set

commit d778b83d40eb76207cd6d90b3c3095e2246722ec
Author: Jason Ish <ish at unx.ca>
Date:   Mon Jun 15 11:14:16 2015 -0600

    defrag: tracker initialization cleanup
    
    Remove the old tracker reset macro which is no longer being used.
    Clear last_seen and remove flags on initialization.
    Remove extra call to DefragTrackerInit as it was being called 2x
    for each new tracker.
    
    Now that DefragTrackerNew is just a wrapper for DefragTrackerAlloc,
    remove it and just call DefragTrackerAlloc directly.

commit 963f30b1149bbfc68fde58203e937829f0dd2b06
Author: Jason Ish <ish at unx.ca>
Date:   Mon Jun 15 11:06:50 2015 -0600

    defrag: don't use trackers marked for removal
    
    These trackers are likely for completed fragments, but have
    not been cleaned up. If a packet on the same flow with an
    already seen IP ID is seen, it could be reused prior to
    being properly reinitialized.

commit 162887cfbf02cfa339ff295376d40a71d9b70d7d
Author: Jason Ish <ish at unx.ca>
Date:   Thu Jun 18 14:18:49 2015 -0600

    defrag: unit test for tracker reuse (current fails)
    
    Will be fixed in subsequent commits as tracker reuse is fixed.

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

Summary of changes:
 ChangeLog                              |  12 ++
 src/defrag-hash.c                      |  21 +---
 src/defrag.c                           | 205 ++++++++++++++++++++++++++++++++-
 src/defrag.h                           |  14 ---
 src/detect-engine-content-inspection.c |   6 +-
 5 files changed, 225 insertions(+), 33 deletions(-)


hooks/post-receive
-- 
OISF