[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-3.0-128-gc8399e8
OISF Git
noreply at openinfosecfoundation.org
Tue Mar 8 09:47:23 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 c8399e8c51916d307dd7815999672617f2e4d7be (commit)
via f001c10ac4239bef5492fead14bcb4f830458028 (commit)
via 9c7e18dc89922e0e669529673efa9df75e8e1af7 (commit)
via fe81bdc213a95a5e0f2253f01938350c1dd64352 (commit)
via 50ea76a88b2ebcdcfeb6aa5a2a37975a99140fbd (commit)
via a53aef9c57a4f7855805bc41e8dd32d1b50ad32a (commit)
via d3677506333e47323093fadc7c24621ae98699a8 (commit)
via 55a8f3ce1dca0b2074d65d520e5a6b087e7403d3 (commit)
via c2e2174942d562bcf86777576b821381c3ef3bc7 (commit)
via 41e540f2f19df61c480d8bd30e761a8cff2c242e (commit)
via de6a37f17bf6be9628564486c1625a7aa55c22ca (commit)
via f34fe85cfedc68e5c5c06a0d699d99b1e9616197 (commit)
via f1f2f0d4782103b8aaaed656d5185a5d77a0e161 (commit)
via 606ac17c5786c98953e8bf1f60d9c3546cd5b6cc (commit)
via cc942b4fb8bc9feaf8e7772674028147ebd17ea2 (commit)
via b1f907a58f764931b39818d8c72c7d41970552fd (commit)
via 2c755b5fc7b2d0148344db2c6d09eb67f537cb9b (commit)
via 2866f87c6d4569b474ec0eb2a6d2a728782f3f4d (commit)
via d0ebe04c8b376b1c6ff537023a480a4ea2619ef6 (commit)
via 24e4edd118c697adb6a0839cfecd18868379dfb9 (commit)
via c49145a79aab1cf010a1e1766d6329555881a231 (commit)
via ab3aed7d251f5abec3b11bbf8af61f3815e33409 (commit)
from 27b02402e70700c46ec6272b70ae6962fb42d867 (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 c8399e8c51916d307dd7815999672617f2e4d7be
Author: Andreas Herz <andi at geekosphere.org>
Date: Mon Mar 7 21:33:14 2016 +0100
configure: bypass libpcre 8.35 check
When --with-libpcre-libraries is used we skip the libpcre 8.35 check
since pkg-config might still point to the 8.35 version installed
although newer version was passed with --with-libpcre-libraries.
commit f001c10ac4239bef5492fead14bcb4f830458028
Author: Eric Leblond <eric at regit.org>
Date: Mon Mar 7 09:16:41 2016 +0100
util-radix-tree: fix memleak
Logic used when adding a new prefix to a node was not correct
as we were allocating a prefix that could be at the end unused.
This patch is updating the code to have a complete creation to
be done if and only if we are needing the complete object. In
the other cases, it was enough to use the function input values.
This fixes:
104 (48 direct, 56 indirect) bytes in 2 blocks are definitely lost in loss record 184 of 327
at 0x4C29C0F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
by 0x9C2DAD: SCRadixCreatePrefix (util-radix-tree.c:144)
by 0x9AFA5B: SCRadixAddKey (util-radix-tree.c:522)
by 0x9B1A4D: SCRadixAddKeyIPV4Netblock (util-radix-tree.c:897)
by 0x67C824: IPOnlyPrepare (detect-engine-iponly.c:1197)
by 0x55172B: SigAddressPrepareStage2 (detect.c:3534)
by 0x5486F4: SigGroupBuild (detect.c:4671)
by 0x547C87: SigLoadSignatures (detect.c:538)
by 0x8FB5D0: LoadSignatures (suricata.c:1976)
by 0x8F3B32: main (suricata.c:2342)
commit 9c7e18dc89922e0e669529673efa9df75e8e1af7
Author: Eric Leblond <eric at regit.org>
Date: Sun Mar 6 21:40:26 2016 +0100
detect-ssl-state: fix memleak
commit fe81bdc213a95a5e0f2253f01938350c1dd64352
Author: Eric Leblond <eric at regit.org>
Date: Sun Mar 6 21:40:18 2016 +0100
detect-ssl-version: simplify code and fix memlea
commit 50ea76a88b2ebcdcfeb6aa5a2a37975a99140fbd
Author: Eric Leblond <eric at regit.org>
Date: Sun Mar 6 21:07:46 2016 +0100
detect-tls: fix memleaks
commit a53aef9c57a4f7855805bc41e8dd32d1b50ad32a
Author: Eric Leblond <eric at regit.org>
Date: Fri Mar 4 19:52:08 2016 +0100
tm-threads: unify thread names handling
TmThreadCreate copy string provided as name for threads to
avoid any issue is a non allocated string is used.
This patch also introduce TmThreadSetGroupName function. This
function is used to be sure we have an allocation when
assigning the thread group name. This way we can free allocated
memory at exit.
Both code changes have required some fixes in different parts of
the code to be in sync with the new API.
Good point about these changes is that it fixes an inconsistency
were some names were not allocated and some were.
commit d3677506333e47323093fadc7c24621ae98699a8
Author: Eric Leblond <eric at regit.org>
Date: Fri Mar 4 20:52:45 2016 +0100
defrag: free defrag tree at exit
This fixes:
72 bytes in 3 blocks are definitely lost in loss record 153 of 316
at 0x4C29C0F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
by 0x9AF041: SCRadixCreateRadixTree (util-radix-tree.c:430)
by 0x50FF5D: DefragPolicyLoadFromConfig (defrag-config.c:138)
by 0x5129F5: DefragInit (defrag.c:962)
by 0x87ECFD: UnixSocketPcapFilesCheck (runmode-unix-socket.c:386)
by 0x90FEC0: UnixCommandBackgroundTasks (unix-manager.c:430)
by 0x913C6D: UnixManager (unix-manager.c:980)
by 0x9072F3: TmThreadsManagement (tm-threads.c:602)
by 0x68DE283: start_thread (pthread_create.c:333)
by 0x80A6A4C: clone (in /lib/x86_64-linux-gnu/libc-2.21.so)
commit 55a8f3ce1dca0b2074d65d520e5a6b087e7403d3
Author: Eric Leblond <eric at regit.org>
Date: Fri Mar 4 19:36:43 2016 +0100
output-stats: fix memleak
This fixes:
16 bytes in 2 blocks are definitely lost in loss record 69 of 319
at 0x4C29C0F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
by 0x85955D: OutputStatsLogThreadInit (output-stats.c:118)
by 0x4CAE13: StatsMgmtThread (counters.c:352)
by 0x68DE283: start_thread (pthread_create.c:333)
by 0x80A6A4C: clone (in /lib/x86_64-linux-gnu/libc-2.21.so)
commit c2e2174942d562bcf86777576b821381c3ef3bc7
Author: Eric Leblond <eric at regit.org>
Date: Fri Mar 4 19:33:25 2016 +0100
tmqh-flow: fix memleak in TmqhFlowCtx cleaning
This fixes:
96 bytes in 4 blocks are definitely lost in loss record 178 of 320
at 0x4C29C0F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
by 0x8FF88C: TmqhOutputFlowSetupCtx (tmqh-flow.c:163)
by 0x908D5F: TmThreadCreate (tm-threads.c:1097)
by 0x909A62: TmThreadCreatePacketHandler (tm-threads.c:1156)
by 0x8790CF: RunModeFilePcapAutoFp (runmode-pcap-file.c:188)
by 0x8837CB: RunModeDispatch (runmodes.c:372)
by 0x87F2A5: UnixSocketPcapFilesCheck (runmode-unix-socket.c:393)
by 0x910460: UnixCommandBackgroundTasks (unix-manager.c:430)
by 0x91420D: UnixManager (unix-manager.c:980)
by 0x907853: TmThreadsManagement (tm-threads.c:602)
by 0x68DE283: start_thread (pthread_create.c:333)
by 0x80A6A4C: clone (in /lib/x86_64-linux-gnu/libc-2.21.so)
commit 41e540f2f19df61c480d8bd30e761a8cff2c242e
Author: Eric Leblond <eric at regit.org>
Date: Fri Mar 4 19:22:46 2016 +0100
tm-threads: fix memleak
Fix cleaning of threads where mutex and condition where not freed.
This fixes:
352 (192 direct, 160 indirect) bytes in 4 blocks are definitely lost in loss record 301 of 327
at 0x4C29C0F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
by 0x909404: TmThreadInitMC (tm-threads.c:1764)
by 0x908DE7: TmThreadCreate (tm-threads.c:1120)
by 0x90A326: TmThreadCreateMgmtThread (tm-threads.c:1183)
by 0x4CA0AD: StatsSpawnThreads (counters.c:856)
by 0x87F254: UnixSocketPcapFilesCheck (runmode-unix-socket.c:396)
by 0x910330: UnixCommandBackgroundTasks (unix-manager.c:430)
by 0x9140DD: UnixManager (unix-manager.c:980)
by 0x9077F3: TmThreadsManagement (tm-threads.c:600)
by 0x68DE283: start_thread (pthread_create.c:333)
by 0x80A6A4C: clone (in /lib/x86_64-linux-gnu/libc-2.21.so)
commit de6a37f17bf6be9628564486c1625a7aa55c22ca
Author: Eric Leblond <eric at regit.org>
Date: Fri Mar 4 19:13:43 2016 +0100
tm-queue: unify queue name handling
Queue name was sometimes allocated and sometimes not. This
patch updates the behavior of creation function so it is
always allocated. This way we can free it at exit and fix
memory leak.
This fixes:
900 bytes in 110 blocks are definitely lost in loss record 322 of 329
at 0x4C29C0F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
by 0x803E0A9: strdup (in /lib/x86_64-linux-gnu/libc-2.21.so)
by 0x90090E: StoreQueueId (tmqh-flow.c:112)
by 0x8FFEA8: TmqhOutputFlowSetupCtx (tmqh-flow.c:180)
by 0x908C7F: TmThreadCreate (tm-threads.c:1095)
by 0x909982: TmThreadCreatePacketHandler (tm-threads.c:1154)
by 0x87906F: RunModeFilePcapAutoFp (runmode-pcap-file.c:188)
by 0x88376B: RunModeDispatch (runmodes.c:372)
by 0x87F245: UnixSocketPcapFilesCheck (runmode-unix-socket.c:393)
by 0x9102B0: UnixCommandBackgroundTasks (unix-manager.c:430)
by 0x91405D: UnixManager (unix-manager.c:980)
by 0x907773: TmThreadsManagement (tm-threads.c:600)
tm-queue: fix logic WIP
commit f34fe85cfedc68e5c5c06a0d699d99b1e9616197
Author: Eric Leblond <eric at regit.org>
Date: Fri Mar 4 18:36:00 2016 +0100
unix-manager: fix memleak at exit
Buffer allocated for UnixClient was not correctly freed.
commit f1f2f0d4782103b8aaaed656d5185a5d77a0e161
Author: Eric Leblond <eric at regit.org>
Date: Fri Mar 4 18:25:43 2016 +0100
util-host-info: fix memleaks
This fixes pcre related memory leak in SCKernelVersionIsAtLeast
function.
commit 606ac17c5786c98953e8bf1f60d9c3546cd5b6cc
Author: Eric Leblond <eric at regit.org>
Date: Fri Mar 4 18:04:31 2016 +0100
util: get rid of json_array_append
This function is causing a memleak because it is necessary to clean
up after usage.
This fixes at least:
37 (32 direct, 5 indirect) bytes in 1 blocks are definitely lost in loss record 104 of 394
at 0x4C29C0F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
by 0x66D0C7B: ??? (in /usr/lib/x86_64-linux-gnu/libjansson.so.4.7.0)
by 0x943584: LiveDeviceIfaceList (util-device.c:264)
by 0x910889: UnixCommandExecute (unix-manager.c:486)
by 0x910D7E: UnixCommandRun (unix-manager.c:545)
by 0x911193: UnixMain (unix-manager.c:593)
by 0x913CC7: UnixManager (unix-manager.c:961)
by 0x907753: TmThreadsManagement (tm-threads.c:600)
by 0x68DE283: start_thread (pthread_create.c:333)
by 0x80A6A4C: clone (in /lib/x86_64-linux-gnu/libc-2.21.so)
commit cc942b4fb8bc9feaf8e7772674028147ebd17ea2
Author: Eric Leblond <eric at regit.org>
Date: Fri Mar 4 18:03:54 2016 +0100
runmodes: fix memleak
active_runmode value was leaking in unix socket mode.
commit b1f907a58f764931b39818d8c72c7d41970552fd
Author: Eric Leblond <eric at regit.org>
Date: Fri Mar 4 17:59:45 2016 +0100
unix-manager: fix memleak
This fixes:
2,595 (1,824 direct, 771 indirect) bytes in 57 blocks are definitely lost in loss record 328 of 332
at 0x4C29C0F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
by 0x66D0C7B: ??? (in /usr/lib/x86_64-linux-gnu/libjansson.so.4.7.0)
by 0x911A27: UnixManagerListCommand (unix-manager.c:766)
by 0x9108A9: UnixCommandExecute (unix-manager.c:486)
by 0x910D9E: UnixCommandRun (unix-manager.c:545)
by 0x9111B3: UnixMain (unix-manager.c:593)
by 0x913D27: UnixManager (unix-manager.c:961)
by 0x907773: TmThreadsManagement (tm-threads.c:600)
by 0x68DE283: start_thread (pthread_create.c:333)
by 0x80A6A4C: clone (in /lib/x86_64-linux-gnu/libc-2.21.so)
commit 2c755b5fc7b2d0148344db2c6d09eb67f537cb9b
Author: Eric Leblond <eric at regit.org>
Date: Fri Mar 4 13:50:26 2016 +0100
output-tx: fix memleak
This fixes:
Direct leak of 31752 byte(s) in 3969 object(s) allocated from:
#0 0x4c396b in malloc (/opt/suricata-asan/bin/suricata+0x4c396b)
#1 0xe385b9 in OutputTxLogThreadInit /home/pmanev/sandnet-qa/stage/oisf/src/output-tx.c:193:34
#2 0x106c255 in TmThreadsSlotPktAcqLoop /home/pmanev/sandnet-qa/stage/oisf/src/tm-threads.c:295:17
#3 0x7fbc9fcb3181 in start_thread /build/eglibc-3GlaMS/eglibc-2.19/nptl/pthread_create.c:312
commit 2866f87c6d4569b474ec0eb2a6d2a728782f3f4d
Author: Eric Leblond <eric at regit.org>
Date: Fri Mar 4 13:47:50 2016 +0100
output-filedata: fix memleak
This fixes:
Direct leak of 31792 byte(s) in 3974 object(s) allocated from:
#0 0x4c396b in malloc (/opt/suricata-asan/bin/suricata+0x4c396b)
#1 0xd86ce2 in OutputFiledataLogThreadInit /home/pmanev/sandnet-qa/stage/oisf/src/output-filedata.c:308:34
#2 0x106c255 in TmThreadsSlotPktAcqLoop /home/pmanev/sandnet-qa/stage/oisf/src/tm-threads.c:295:17
#3 0x7fbc9fcb3181 in start_thread /build/eglibc-3GlaMS/eglibc-2.19/nptl/pthread_create.c:312
commit d0ebe04c8b376b1c6ff537023a480a4ea2619ef6
Author: Eric Leblond <eric at regit.org>
Date: Fri Mar 4 13:43:07 2016 +0100
output-packet: fix memleak
This fixes:
Direct leak of 31832 byte(s) in 3979 object(s) allocated from:
#0 0x4c396b in malloc (/opt/suricata-asan/bin/suricata+0x4c396b)
#1 0xe22129 in OutputPacketLogThreadInit /home/pmanev/sandnet-qa/stage/oisf/src/output-packet.c:123:34
#2 0x106c255 in TmThreadsSlotPktAcqLoop /home/pmanev/sandnet-qa/stage/oisf/src/tm-threads.c:295:17
#3 0x7fbc9fcb3181 in start_thread /build/eglibc-3GlaMS/eglibc-2.19/nptl/pthread_create.c:312
commit 24e4edd118c697adb6a0839cfecd18868379dfb9
Author: Eric Leblond <eric at regit.org>
Date: Fri Mar 4 13:38:54 2016 +0100
output-file: fix memleak
This fixes:
Direct leak of 31856 byte(s) in 3982 object(s) allocated from:
#0 0x4c396b in malloc (/opt/suricata-asan/bin/suricata+0x4c396b)
#1 0xd7ff39 in OutputFileLogThreadInit /home/pmanev/sandnet-qa/stage/oisf/src/output-file.c:182:34
#2 0x106c255 in TmThreadsSlotPktAcqLoop /home/pmanev/sandnet-qa/stage/oisf/src/tm-threads.c:295:17
#3 0x7fbc9fcb3181 in start_thread /build/eglibc-3GlaMS/eglibc-2.19/nptl/pthread_create.c:312
commit c49145a79aab1cf010a1e1766d6329555881a231
Author: Eric Leblond <eric at regit.org>
Date: Fri Mar 4 13:33:16 2016 +0100
log-filestore: suppress unused code
Code was unused and was leaking memory.
This fixes:
Direct leak of 614240 byte(s) in 3839 object(s) allocated from:
#0 0x4c396b in malloc (/opt/suricata-asan/bin/suricata+0x4c396b)
#1 0x11bc12e in LogFileNewCtx /home/pmanev/sandnet-qa/stage/oisf/src/util-logopenfile.c:474:27
#2 0xcf7ef2 in LogFilestoreLogInitCtx /home/pmanev/sandnet-qa/stage/oisf/src/log-filestore.c:430:31
#3 0xec3275 in RunModeInitializeOutputs /home/pmanev/sandnet-qa/stage/oisf/src/runmodes.c:763:26
#4 0xeae17f in UnixSocketPcapFilesCheck /home/pmanev/sandnet-qa/stage/oisf/src/runmode-unix-socket.c:391:9
#5 0x109bc37 in UnixCommandBackgroundTasks /home/pmanev/sandnet-qa/stage/oisf/src/unix-manager.c:430:20
#6 0x10a9be2 in UnixManager /home/pmanev/sandnet-qa/stage/oisf/src/unix-manager.c:977:9
#7 0x1075643 in TmThreadsManagement /home/pmanev/sandnet-qa/stage/oisf/src/tm-threads.c:600:9
#8 0x7fbc9fcb3181 in start_thread /build/eglibc-3GlaMS/eglibc-2.19/nptl/pthread_create.c:312
commit ab3aed7d251f5abec3b11bbf8af61f3815e33409
Author: Eric Leblond <eric at regit.org>
Date: Thu Mar 3 10:35:19 2016 +0100
decode: update icmpv6 message handling
This patch adds two new events relative to icmpv6. One for packets
using unassigned icmpv6 type. The second one for packets using
private experimentation type.
Icmpv6 type table taken from http://www.iana.org/assignments/icmpv6-parameters/icmpv6-parameters.xhtml#icmpv6-parameters-2
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 22 +++++++-------
rules/decoder-events.rules | 7 +++--
src/decode-events.h | 2 ++
src/decode-icmpv6.c | 23 +++++++++++++--
src/defrag-config.c | 8 ++++++
src/defrag-config.h | 1 +
src/defrag.c | 1 +
src/detect-engine-event.h | 2 ++
src/detect-ssl-state.c | 1 +
src/detect-ssl-version.c | 7 +++--
src/detect-tls.c | 9 ++++++
src/log-filestore.c | 6 ----
src/output-file.c | 2 ++
src/output-filedata.c | 2 ++
src/output-packet.c | 2 ++
src/output-stats.c | 2 ++
src/output-tx.c | 2 ++
src/runmode-erf-file.c | 16 ++---------
src/runmode-pcap-file.c | 16 ++---------
src/runmode-tile.c | 7 +----
src/runmodes.c | 3 ++
src/tm-queues.c | 11 ++++++-
src/tm-threads.c | 46 +++++++++++++++++++++++++++++-
src/tm-threads.h | 1 +
src/tmqh-flow.c | 3 +-
src/unix-manager.c | 5 +++-
src/util-device.c | 2 +-
src/util-host-info.c | 2 ++
src/util-profiling-rules.c | 2 +-
src/util-radix-tree.c | 27 ++++++++++--------
src/util-runmodes.c | 71 +++++++---------------------------------------
31 files changed, 174 insertions(+), 137 deletions(-)
hooks/post-receive
--
OISF
More information about the Oisf-devel
mailing list