[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-4.0.0-rc2

Thu Jul 13 15:06:30 UTC 2017

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  57791bd670d0f9e4e254aa6df2757d4660827a1b (commit)
       via  df3a3c785734792da484d3f5547bdfcd20cc4f26 (commit)
       via  a306ccfd34e7e2ccb12c41ae13e9dbffcfdcb3f1 (commit)
       via  3e9b583d479ffd619fa25a42a0ca550a7e95691b (commit)
       via  5b84c01cd3567ac531413c0f4bec9bd59223b011 (commit)
       via  7e72553ff8b5b205f2f15b7937e1e756219464e9 (commit)
       via  16845d8c922184edd1a08638401ac2e3ed15e0ec (commit)
      from  96b2e8afc02ba47e638eb6e8cc729c97f2437ec3 (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 57791bd670d0f9e4e254aa6df2757d4660827a1b
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Jul 12 16:45:41 2017 +0200

    changelog: update for 4.0.0-rc2 release

commit df3a3c785734792da484d3f5547bdfcd20cc4f26
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Jul 10 10:15:54 2017 +0200

    der/asn1: limit recursion

    Limit the number of recursive calls in the DER/ASN.1 decoder to avoid
    stack overflows.

    Found using AFL.

commit a306ccfd34e7e2ccb12c41ae13e9dbffcfdcb3f1
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Jul 12 10:56:56 2017 +0200

    rust/nfs: implement events

    Remove lots of panic statements in favor of setting non-fatal events.

    Bug #2175.

commit 3e9b583d479ffd619fa25a42a0ca550a7e95691b
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Jul 13 10:04:47 2017 +0200

    radix: fix risky malloc call

    GCC7 said:
      CC       util-radix-tree.o
    In file included from util-debug-filters.h:29:0,
                     from util-debug.h:34,
                     from suricata-common.h:421,
                     from util-radix-tree.c:26:
    util-radix-tree.c: In function ‘SCRadixAddKey’:
    util-mem.h:177:12: error: argument 1 range [18446744071562067968, 18446744073709551615] exceeds maximum object size 9223372036854775807 [-Werror=alloc-size-larger-than=]
         ptrmem = malloc((a)); \
         ~~~~~~~^~~~~~~~~~~~~
    util-radix-tree.c:749:42: note: in expansion of macro ‘SCMalloc’
                 if ( (inter_node->netmasks = SCMalloc((node->netmask_cnt - i) *
                                              ^~~~~~~~
    In file included from suricata-common.h:69:0,
                     from util-radix-tree.c:26:
    /usr/include/stdlib.h:443:14: note: in a call to allocation function ‘malloc’ declared here
     extern void *malloc (size_t __size) __THROW __attribute_malloc__ __wur;
                  ^~~~~~

    scan-build said:
    util-radix-tree.c:749:42: warning: Call to 'malloc' has an allocation size of 0 bytes
                if ( (inter_node->netmasks = SCMalloc((node->netmask_cnt - i) *
                                             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    ./util-mem.h:177:14: note: expanded from macro 'SCMalloc'
        ptrmem = malloc((a)); \
                 ^~~~~~~~~~~
    1 warning generated.

commit 5b84c01cd3567ac531413c0f4bec9bd59223b011
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Jul 13 09:57:40 2017 +0200

    gcc7: fix format-truncation warnings in runmodes

    Example:

    util-runmodes.c: In function ‘RunModeSetIPSAutoFp’:
    util-runmodes.c:496:40: error: ‘snprintf’ output may be truncated before the last format character [-Werror=format-truncation=]
             snprintf(qname, sizeof(qname), "pickup%d", thread+1);
                                            ^~~~~~~~~~
    util-runmodes.c:496:9: note: ‘snprintf’ output between 8 and 17 bytes into a destination of size16
             snprintf(qname, sizeof(qname), "pickup%d", thread+1);
             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

    Solved by reducing 'thread' to a uint16_t and limiting the max
    thread count to 1024.

commit 7e72553ff8b5b205f2f15b7937e1e756219464e9
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Jul 13 09:06:39 2017 +0200

    gcc7: fix format truncation warning

    detect-rpc.c: In function ‘DetectRpcParse’:
    detect-rpc.c:225:50: error: ‘%s’ directive argument is null [-Werror=format-truncation=]
                     SCLogError(SC_ERR_INVALID_VALUE, "invalid rpc option %s",args[i]);
                                                      ^
    util-debug.h:239:77: note: in definition of macro ‘SCLogErr’
                 int _sc_log_ret = snprintf(_sc_log_msg, SC_LOG_MAX_LOG_MSG_LEN, __VA_ARGS__);   \
                                                                                 ^~~~~~~~~~~
    detect-rpc.c:225:17: note: in expansion of macro ‘SCLogError’
                     SCLogError(SC_ERR_INVALID_VALUE, "invalid rpc option %s",args[i]);
                     ^~~~~~~~~~

commit 16845d8c922184edd1a08638401ac2e3ed15e0ec
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Jul 13 08:51:30 2017 +0200

    pcap-log: fix path construct check

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

Summary of changes:
 ChangeLog               |  14 ++++
 rules/Makefile.am       |   3 +-
 rules/nfs-events.rules  |   8 +++
 rust/gen-c-headers.py   |   2 +
 rust/src/nfs/nfs.rs     | 185 +++++++++++++++++++++++++++++++++++++++---------
 src/app-layer-nfs-tcp.c |  44 +++---------
 src/app-layer-nfs-tcp.h |   2 +
 src/app-layer-nfs-udp.c |  44 +++---------
 src/detect-rpc.c        |  14 ++--
 src/log-pcap.c          |   4 +-
 src/runmode-erf-file.c  |  10 +--
 src/runmode-pcap-file.c |   8 ++-
 src/util-decode-der.c   |   5 ++
 src/util-radix-tree.c   |  23 +++---
 src/util-runmodes.c     |  21 +++---
 15 files changed, 251 insertions(+), 136 deletions(-)
 create mode 100644 rules/nfs-events.rules

hooks/post-receive
-- 
OISF