[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.0.1-32-g2c20c9d

[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  2c20c9d409737b8be1ab75261662ba2a59c94497 (commit)
       via  8a77e6bc8e6677b2bdf7205891073b9bfb7055ef (commit)
      from  fc2014ab40f1b533e51fdf262ca46bfa497e5e74 (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 2c20c9d409737b8be1ab75261662ba2a59c94497
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Jun 4 17:11:29 2014 +0200

    Fix Coverity 1220098 and 1220099
    
    *** CID 1220098:  Missing unlock  (LOCK)
    /src/log-droplog.c: 195 in LogDropLogNetFilter()
    189         SCMutexLock(&dlt->file_ctx->fp_mutex);
    190
    191         if (dlt->file_ctx->rotation_flag) {
    192             dlt->file_ctx->rotation_flag  = 0;
    193             if (SCConfLogReopen(dlt->file_ctx) != 0) {
    194                 /* Rotation failed, error already logged. */
    >>>     CID 1220098:  Missing unlock  (LOCK)
    >>>     Returning without unlocking "dlt->file_ctx->fp_mutex".
    195                 return TM_ECODE_FAILED;
    196             }
    197         }
    198
    199         if (dlt->file_ctx == NULL) {
    200             return TM_ECODE_FAILED;
    
    *** CID 1220099:  Dereference before null check  (REVERSE_INULL)
    /src/log-droplog.c: 199 in LogDropLogNetFilter()
    193             if (SCConfLogReopen(dlt->file_ctx) != 0) {
    194                 /* Rotation failed, error already logged. */
    195                 return TM_ECODE_FAILED;
    196             }
    197         }
    198
    >>>     CID 1220099:  Dereference before null check  (REVERSE_INULL)
    >>>     Null-checking "dlt->file_ctx" suggests that it may be null, but it has already been dereferenced on all paths leading to the check.
    199         if (dlt->file_ctx == NULL) {
    200             return TM_ECODE_FAILED;
    201         }
    202
    203         char srcip[46] = "";
    204         char dstip[46] = "";

commit 8a77e6bc8e6677b2bdf7205891073b9bfb7055ef
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Jun 4 16:54:56 2014 +0200

    Fix Coverity 1220097
    
    *** CID 1220097:  Missing unlock  (LOCK)
    /src/log-file.c: 160 in LogFileWriteJsonRecord()
    154             }
    155         }
    156
    157         /* Bail early if no file pointer to write to (in the unlikely
    158          * event file rotation failed. */
    159         if (aft->file_ctx->fp == NULL) {
    >>>     CID 1220097:  Missing unlock  (LOCK)
    >>>     Returning without unlocking "aft->file_ctx->fp_mutex".
    160             return;
    161         }
    162
    163         FILE *fp = aft->file_ctx->fp;
    164         char timebuf[64];
    165         AppProto alproto = FlowGetAppProtocol(p->flow);

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

Summary of changes:
 src/log-droplog.c |    5 +----
 src/log-file.c    |    1 +
 2 files changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
OISF