[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-3.0-177-g8edbc20

Tue Mar 22 10:23:14 UTC 2016

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  8edbc20a07e2fe5692889db1f7fbcd7cc87127b9 (commit)
       via  1b1cde68379a3e777ddd8632d748f302b479e6a7 (commit)
       via  a05cdbdf2810ded5116622ffb8dc49fa53780a42 (commit)
       via  9dec6d933fb36a939288873e68dd09d2d72e19d7 (commit)
       via  92ad63abb78fc51b88d2c511f6c85a975509b8f9 (commit)
       via  b5972eeea282bf033fead106a6c69db459487348 (commit)
       via  e4443fac53969f810a1713a0cd7dc73e71eaaf23 (commit)
       via  02d4e729c4aba5b215fbaa64f709c2a101a1ba09 (commit)
       via  f891aadefc910354362144870d3f10387274e967 (commit)
      from  eb39487f48fd2daa16a8e131351aaebd42768eef (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 8edbc20a07e2fe5692889db1f7fbcd7cc87127b9
Author: Jason Ish <ish at unx.ca>
Date:   Thu Mar 10 14:32:06 2016 -0600

    flow: record the flow hash for use as the output flow id

    Provides a consistent hash for a flow, as well as a better
    distribution than using a memory address.

commit 1b1cde68379a3e777ddd8632d748f302b479e6a7
Author: Eric Leblond <eric at regit.org>
Date:   Mon Mar 21 15:27:55 2016 +0100

    output-json-email: fix memleak

    This patch fixes some error handling in code generating JSON output for
    email event.

    This fixes:

    Indirect leak of 128 byte(s) in 1 object(s) allocated from:
        #0 0x50c142 in malloc (/home/eric/git/oisf/src/.libs/lt-suricata+0x50c142)
        #1 0x7ff92394771c  (/usr/lib/x86_64-linux-gnu/libjansson.so.4+0x371c)
        #2 0x1bd3309 in JsonEmailLogJson /home/eric/git/oisf/src/output-json-email-common.c:376:19
        #3 0x1bfe774 in JsonSmtpLogger /home/eric/git/oisf/src/output-json-smtp.c:103:9
        #4 0x1c378ff in OutputTxLog /home/eric/git/oisf/src/output-tx.c:165:17
        #5 0x1f94ef3 in TmThreadsSlotVarRun /home/eric/git/oisf/src/tm-threads.c:134:17
        #6 0x1d33478 in TmThreadsSlotProcessPkt /home/eric/git/oisf/src/./tm-threads.h:150:9
        #7 0x1d32dd4 in PcapFileCallbackLoop /home/eric/git/oisf/src/source-pcap-file.c:184:9
        #8 0x7ff924199013  (/usr/lib/x86_64-linux-gnu/libpcap.so.0.8+0x1f013)

    Indirect leak of 96 byte(s) in 3 object(s) allocated from:
        #0 0x50c142 in malloc (/home/eric/git/oisf/src/.libs/lt-suricata+0x50c142)
        #1 0x7ff92394bc7b  (/usr/lib/x86_64-linux-gnu/libjansson.so.4+0x7c7b)

    Indirect leak of 82 byte(s) in 3 object(s) allocated from:
        #0 0x50c142 in malloc (/home/eric/git/oisf/src/.libs/lt-suricata+0x50c142)
        #1 0x7ff923949924  (/usr/lib/x86_64-linux-gnu/libjansson.so.4+0x5924)

    Indirect leak of 72 byte(s) in 1 object(s) allocated from:
        #0 0x50c142 in malloc (/home/eric/git/oisf/src/.libs/lt-suricata+0x50c142)
        #1 0x7ff92394bcda in json_object (/usr/lib/x86_64-linux-gnu/libjansson.so.4+0x7cda)
        #2 0x1bd3309 in JsonEmailLogJson /home/eric/git/oisf/src/output-json-email-common.c:376:19
        #3 0x1bfe774 in JsonSmtpLogger /home/eric/git/oisf/src/output-json-smtp.c:103:9
        #4 0x1c378ff in OutputTxLog /home/eric/git/oisf/src/output-tx.c:165:17
        #5 0x1f94ef3 in TmThreadsSlotVarRun /home/eric/git/oisf/src/tm-threads.c:134:17
        #6 0x1d33478 in TmThreadsSlotProcessPkt /home/eric/git/oisf/src/./tm-threads.h:150:9
        #7 0x1d32dd4 in PcapFileCallbackLoop /home/eric/git/oisf/src/source-pcap-file.c:184:9
        #8 0x7ff924199013  (/usr/lib/x86_64-linux-gnu/libpcap.so.0.8+0x1f013)

    Indirect leak of 64 byte(s) in 1 object(s) allocated from:
        #0 0x50c142 in malloc (/home/eric/git/oisf/src/.libs/lt-suricata+0x50c142)
        #1 0x7ff92394bf5a in json_array (/usr/lib/x86_64-linux-gnu/libjansson.so.4+0x7f5a)
        #2 0x1bd04b5 in JsonEmailLogJsonData /home/eric/git/oisf/src/output-json-email-common.c:296:27
        #3 0x1bd3309 in JsonEmailLogJson /home/eric/git/oisf/src/output-json-email-common.c:376:19
        #4 0x1bfe774 in JsonSmtpLogger /home/eric/git/oisf/src/output-json-smtp.c:103:9
        #5 0x1c378ff in OutputTxLog /home/eric/git/oisf/src/output-tx.c:165:17
        #6 0x1f94ef3 in TmThreadsSlotVarRun /home/eric/git/oisf/src/tm-threads.c:134:17
        #7 0x1d33478 in TmThreadsSlotProcessPkt /home/eric/git/oisf/src/./tm-threads.h:150:9
        #8 0x1d32dd4 in PcapFileCallbackLoop /home/eric/git/oisf/src/source-pcap-file.c:184:9
        #9 0x7ff924199013  (/usr/lib/x86_64-linux-gnu/libpcap.so.0.8+0x1f013)

    Indirect leak of 48 byte(s) in 1 object(s) allocated from:
        #0 0x50c142 in malloc (/home/eric/git/oisf/src/.libs/lt-suricata+0x50c142)
        #1 0x7ff92394bf2a in json_array (/usr/lib/x86_64-linux-gnu/libjansson.so.4+0x7f2a)
        #2 0x1bd04b5 in JsonEmailLogJsonData /home/eric/git/oisf/src/output-json-email-common.c:296:27
        #3 0x1bd3309 in JsonEmailLogJson /home/eric/git/oisf/src/output-json-email-common.c:376:19
        #4 0x1bfe774 in JsonSmtpLogger /home/eric/git/oisf/src/output-json-smtp.c:103:9
        #5 0x1c378ff in OutputTxLog /home/eric/git/oisf/src/output-tx.c:165:17
        #6 0x1f94ef3 in TmThreadsSlotVarRun /home/eric/git/oisf/src/tm-threads.c:134:17
        #7 0x1d33478 in TmThreadsSlotProcessPkt /home/eric/git/oisf/src/./tm-threads.h:150:9
        #8 0x1d32dd4 in PcapFileCallbackLoop /home/eric/git/oisf/src/source-pcap-file.c:184:9
        #9 0x7ff924199013  (/usr/lib/x86_64-linux-gnu/libpcap.so.0.8+0x1f013)

commit a05cdbdf2810ded5116622ffb8dc49fa53780a42
Author: Eric Leblond <eric at regit.org>
Date:   Fri Mar 18 09:53:21 2016 +0100

    output-json-email: fix memleak

    This possibly fix:

    ndirect leak of 64 byte(s) in 1 object(s) allocated from:
        #0 0x4c264b in malloc (/home/victor/qa/buildbot/donkey/z600fuzz/Private/src/.libs/lt-suricata+0x4c264b)
        #1 0x7fb09c1e8aaa in json_array (/usr/lib/x86_64-linux-gnu/libjansson.so.4+0x6aaa)
        #2 0xd67553 in JsonEmailLogJsonData /home/victor/qa/buildbot/donkey/z600fuzz/Private/src/output-json-email-common.c:290:27
        #3 0xd6a272 in JsonEmailLogJson /home/victor/qa/buildbot/donkey/z600fuzz/Private/src/output-json-email-common.c:370:19
        #4 0xd956b9 in JsonSmtpLogger /home/victor/qa/buildbot/donkey/z600fuzz/Private/src/output-json-smtp.c:103:9
        #5 0xdcedac in OutputTxLog /home/victor/qa/buildbot/donkey/z600fuzz/Private/src/output-tx.c:165:17
        #6 0xff6669 in TmThreadsSlotVarRun /home/victor/qa/buildbot/donkey/z600fuzz/Private/src/tm-threads.c:132:17
        #7 0xffecc1 in TmThreadsSlotVar /home/victor/qa/buildbot/donkey/z600fuzz/Private/src/tm-threads.c:474:17
        #8 0x7fb09bfcc181 in start_thread /build/eglibc-3GlaMS/eglibc-2.19/nptl/pthread_create.c:312

commit 9dec6d933fb36a939288873e68dd09d2d72e19d7
Author: Eric Leblond <eric at regit.org>
Date:   Fri Mar 18 09:28:58 2016 +0100

    output-json-email: fix memleak in error path

    In JsonEmailLogJsonData function, an invalid state was leading to
    early exit without a proper freeing of resources.

    This should fix:

    Indirect leak of 72 byte(s) in 1 object(s) allocated from:
        #0 0x4c264b in malloc (/home/victor/qa/buildbot/donkey/z600fuzz/Private/src/.libs/lt-suricata+0x4c264b)
        #1 0x7fb09c1e886a in json_object (/usr/lib/x86_64-linux-gnu/libjansson.so.4+0x686a)
        #2 0xd6a272 in JsonEmailLogJson /home/victor/qa/buildbot/donkey/z600fuzz/Private/src/output-json-email-common.c:370:19
        #3 0xd956b9 in JsonSmtpLogger /home/victor/qa/buildbot/donkey/z600fuzz/Private/src/output-json-smtp.c:103:9
        #4 0xdcedac in OutputTxLog /home/victor/qa/buildbot/donkey/z600fuzz/Private/src/output-tx.c:165:17
        #5 0xff6669 in TmThreadsSlotVarRun /home/victor/qa/buildbot/donkey/z600fuzz/Private/src/tm-threads.c:132:17
        #6 0xffecc1 in TmThreadsSlotVar /home/victor/qa/buildbot/donkey/z600fuzz/Private/src/tm-threads.c:474:17
        #7 0x7fb09bfcc181 in start_thread /build/eglibc-3GlaMS/eglibc-2.19/nptl/pthread_create.c:312

commit 92ad63abb78fc51b88d2c511f6c85a975509b8f9
Author: Eric Leblond <eric at regit.org>
Date:   Fri Mar 18 09:23:31 2016 +0100

    output-json-email: fix error code

    Returning early if first function call fail could avoid some issue.

commit b5972eeea282bf033fead106a6c69db459487348
Author: JonZeolla <Zeolla at gmail.com>
Date:   Wed Mar 16 09:28:02 2016 -0400

    Fix typos in an error message

    Fix two minor typos in a SC_ERR_INVALID_ARGUMENT error message.

commit e4443fac53969f810a1713a0cd7dc73e71eaaf23
Author: gureedo <gureedo at intersvyaz.net>
Date:   Mon Mar 21 15:14:34 2016 +0500

    netmap: fix issue 1717
    Use packet pool only without packet allocation.
    Wait for N packets available in packet pool before netmap ring fetching.

commit 02d4e729c4aba5b215fbaa64f709c2a101a1ba09
Author: gureedo <gureedo at intersvyaz.net>
Date:   Mon Mar 21 14:41:42 2016 +0500

    netmap: fix log typo

commit f891aadefc910354362144870d3f10387274e967
Author: gureedo <gureedo at intersvyaz.net>
Date:   Mon Mar 21 14:38:53 2016 +0500

    netmap: remove workers zero copy mode restriction between interfaces
    Rationale: https://github.com/luigirizzo/netmap/issues/126

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

Summary of changes:
 src/flow-hash.c                | 36 +++++++++++++++++-------------------
 src/flow.h                     | 13 ++++++++-----
 src/output-json-email-common.c | 14 +++++++++++++-
 src/output-json.c              |  7 +------
 src/source-netmap.c            | 28 ++++++++++++++++++----------
 src/util-affinity.c            |  2 +-
 6 files changed, 58 insertions(+), 42 deletions(-)

hooks/post-receive
-- 
OISF