Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1725 #1948

Closed
wants to merge 3 commits into from
Closed

Bug 1725 #1948

wants to merge 3 commits into from

Conversation

regit
Copy link
Contributor

@regit regit commented Mar 18, 2016

@regit
output-json-email: fix error code
3c96754 
Returning early if first function call fail could avoid some issue.
@regit
output-json-email: fix memleak in error path
c6a8022 
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
@regit
output-json-email: fix memleak
53ddfb8 
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
@inliniac
Copy link
Contributor

Still getting:

=================================================================
==15439==ERROR: LeakSanitizer: detected memory leaks
Indirect leak of 945 byte(s) in 21 object(s) allocated from:
    #0 0x4c610b in malloc (/home/victor/dev/suricata/src/suricata+0x4c610b)
    #1 0x7f18bb5f2b48 (/usr/lib/x86_64-linux-gnu/libjansson.so.4+0x2b48)
Indirect leak of 598 byte(s) in 21 object(s) allocated from:
    #0 0x4c610b in malloc (/home/victor/dev/suricata/src/suricata+0x4c610b)
    #1 0x7f18bb5f48ff (/usr/lib/x86_64-linux-gnu/libjansson.so.4+0x48ff)
Indirect leak of 560 byte(s) in 7 object(s) allocated from:
    #0 0x4c610b in malloc (/home/victor/dev/suricata/src/suricata+0x4c610b)
    #1 0x7f18bb5f28dc (/usr/lib/x86_64-linux-gnu/libjansson.so.4+0x28dc)
    #2 0xd81fc3 in JsonEmailLogJson /home/victor/dev/suricata/src/output-json-email-common.c:374:19
    #3 0xdad47d in JsonSmtpLogger /home/victor/dev/suricata/src/output-json-smtp.c:103:9
    #4 0xde6a3d in OutputTxLog /home/victor/dev/suricata/src/output-tx.c:165:17
    #5 0x100cb9a in TmThreadsSlotVarRun /home/victor/dev/suricata/src/tm-threads.c:134:17
    #6 0x10151ea in TmThreadsSlotVar /home/victor/dev/suricata/src/tm-threads.c:476:17
    #7 0x7f18bb3da181 in start_thread /build/eglibc-3GlaMS/eglibc-2.19/nptl/pthread_create.c:312
Indirect leak of 504 byte(s) in 21 object(s) allocated from:
    #0 0x4c610b in malloc (/home/victor/dev/suricata/src/suricata+0x4c610b)
    #1 0x7f18bb5f6be7 in json_string_nocheck (/usr/lib/x86_64-linux-gnu/libjansson.so.4+0x6be7)
Indirect leak of 504 byte(s) in 7 object(s) allocated from:
    #0 0x4c610b in malloc (/home/victor/dev/suricata/src/suricata+0x4c610b)
    #1 0x7f18bb5f686a in json_object (/usr/lib/x86_64-linux-gnu/libjansson.so.4+0x686a)
    #2 0xd81fc3 in JsonEmailLogJson /home/victor/dev/suricata/src/output-json-email-common.c:374:19
    #3 0xdad47d in JsonSmtpLogger /home/victor/dev/suricata/src/output-json-smtp.c:103:9
    #4 0xde6a3d in OutputTxLog /home/victor/dev/suricata/src/output-tx.c:165:17
    #5 0x100cb9a in TmThreadsSlotVarRun /home/victor/dev/suricata/src/tm-threads.c:134:17
    #6 0x10151ea in TmThreadsSlotVar /home/victor/dev/suricata/src/tm-threads.c:476:17
    #7 0x7f18bb3da181 in start_thread /build/eglibc-3GlaMS/eglibc-2.19/nptl/pthread_create.c:312
Indirect leak of 448 byte(s) in 7 object(s) allocated from:
    #0 0x4c610b in malloc (/home/victor/dev/suricata/src/suricata+0x4c610b)
    #1 0x7f18bb5f6aaa in json_array (/usr/lib/x86_64-linux-gnu/libjansson.so.4+0x6aaa)
    #2 0xd7f17a in JsonEmailLogJsonData /home/victor/dev/suricata/src/output-json-email-common.c:294:27
    #3 0xd81fc3 in JsonEmailLogJson /home/victor/dev/suricata/src/output-json-email-common.c:374:19
    #4 0xdad47d in JsonSmtpLogger /home/victor/dev/suricata/src/output-json-smtp.c:103:9
    #5 0xde6a3d in OutputTxLog /home/victor/dev/suricata/src/output-tx.c:165:17
    #6 0x100cb9a in TmThreadsSlotVarRun /home/victor/dev/suricata/src/tm-threads.c:134:17
    #7 0x10151ea in TmThreadsSlotVar /home/victor/dev/suricata/src/tm-threads.c:476:17
    #8 0x7f18bb3da181 in start_thread /build/eglibc-3GlaMS/eglibc-2.19/nptl/pthread_create.c:312
Indirect leak of 336 byte(s) in 7 object(s) allocated from:
    #0 0x4c610b in malloc (/home/victor/dev/suricata/src/suricata+0x4c610b)
    #1 0x7f18bb5f6a7a in json_array (/usr/lib/x86_64-linux-gnu/libjansson.so.4+0x6a7a)
    #2 0xd7f17a in JsonEmailLogJsonData /home/victor/dev/suricata/src/output-json-email-common.c:294:27
    #3 0xd81fc3 in JsonEmailLogJson /home/victor/dev/suricata/src/output-json-email-common.c:374:19
    #4 0xdad47d in JsonSmtpLogger /home/victor/dev/suricata/src/output-json-smtp.c:103:9
    #5 0xde6a3d in OutputTxLog /home/victor/dev/suricata/src/output-tx.c:165:17
    #6 0x100cb9a in TmThreadsSlotVarRun /home/victor/dev/suricata/src/tm-threads.c:134:17
    #7 0x10151ea in TmThreadsSlotVar /home/victor/dev/suricata/src/tm-threads.c:476:17
    #8 0x7f18bb3da181 in start_thread /build/eglibc-3GlaMS/eglibc-2.19/nptl/pthread_create.c:312

@regit regit mentioned this pull request Mar 21, 2016
Closed
@inliniac
Copy link
Contributor

Replaced by #1952

@inliniac inliniac closed this Mar 31, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Milestone
No milestone
2 participants
@regit @inliniac