[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-1.4beta1-64-gb6f573d
noreply at openinfosecfoundation.org
noreply at openinfosecfoundation.org
Tue Sep 25 15:38:38 UTC 2012
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 b6f573d9cb1366c3e505347780569101539f77ce (commit)
via 28ca36acf770ef797df306687af8d2c38bedecc1 (commit)
via 9f135728433d91c9a02381caaf2f2d4404843171 (commit)
via 710d237724ae4ac47ec7c05c92cf9cf22f690123 (commit)
via 3d2998a9cf1d5ee50719402ee7627442c0fa1745 (commit)
via e176be6fcc02e04f8d6acf9afd0933353085e18e (commit)
via d2920048801b68d6075ff9672710c4a1f59e4707 (commit)
via 655577cbbc2000e0dc6dbe3d6248bedc7a797d07 (commit)
from d8667448c1be1bad675d74d201320729df45fc46 (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 b6f573d9cb1366c3e505347780569101539f77ce
Author: Victor Julien <victor at inliniac.net>
Date: Tue Sep 25 14:46:51 2012 +0200
yaml: add addr and port vars commonly used by ET/ETpro
commit 28ca36acf770ef797df306687af8d2c38bedecc1
Author: Eric Leblond <eric at regit.org>
Date: Fri Sep 21 12:47:44 2012 +0200
coccinelle: add test on malloc error check.
This patch adds a coccinelle code check on SCMalloc, SCCalloc and
SCStrdup and other memory handling functions. It verifies that the
error checking is made.
commit 9f135728433d91c9a02381caaf2f2d4404843171
Author: Eric Leblond <eric at regit.org>
Date: Mon Sep 24 13:24:29 2012 +0200
Fix indentation of win32 files.
commit 710d237724ae4ac47ec7c05c92cf9cf22f690123
Author: Eric Leblond <eric at regit.org>
Date: Mon Sep 24 13:02:30 2012 +0200
Add missing sctrdup test
commit 3d2998a9cf1d5ee50719402ee7627442c0fa1745
Author: Eric Leblond <eric at regit.org>
Date: Sun Sep 23 18:05:32 2012 +0200
coccinelle: don't test UNITTEST code
commit e176be6fcc02e04f8d6acf9afd0933353085e18e
Author: Eric Leblond <eric at regit.org>
Date: Sun Sep 23 15:56:00 2012 +0200
Use unlikely for error treatment.
When handling error case on SCMallog, SCCalloc or SCStrdup
we are in an unlikely case. This patch adds the unlikely()
expression to indicate this to gcc.
This patch has been obtained via coccinelle. The transformation
is the following:
@istested@
identifier x;
statement S1;
identifier func =~ "(SCMalloc|SCStrdup|SCCalloc)";
@@
x = func(...)
... when != x
- if (x == NULL) S1
+ if (unlikely(x == NULL)) S1
commit d2920048801b68d6075ff9672710c4a1f59e4707
Author: Eric Leblond <eric at regit.org>
Date: Fri Sep 21 23:26:53 2012 +0200
Add some missing checks of SCStrdup return.
commit 655577cbbc2000e0dc6dbe3d6248bedc7a797d07
Author: Eric Leblond <eric at regit.org>
Date: Fri Sep 21 15:24:17 2012 +0200
Add some missing checks of SCMalloc return.
-----------------------------------------------------------------------
Summary of changes:
qa/coccinelle/malloc-error-check.cocci | 44 +++
qa/coccinelle/run_check.sh | 2 +-
src/alert-debuglog.c | 4 +-
src/alert-fastlog.c | 4 +-
src/alert-pcapinfo.c | 4 +-
src/alert-prelude.c | 7 +-
src/alert-syslog.c | 4 +-
src/alert-unified2-alert.c | 16 +-
src/app-layer-dcerpc-udp.c | 2 +-
src/app-layer-dcerpc.c | 2 +-
src/app-layer-detect-proto.c | 4 +-
src/app-layer-ftp.c | 2 +-
src/app-layer-htp.c | 6 +-
src/app-layer-parser.c | 10 +-
src/app-layer-smb.c | 2 +-
src/app-layer-smb2.c | 2 +-
src/app-layer-smtp.c | 11 +-
src/app-layer-ssh.c | 2 +-
src/app-layer-ssl.c | 2 +-
src/conf.c | 14 +-
src/cuda-packet-batcher.c | 8 +-
src/decode-ethernet.c | 2 +-
src/decode-events.c | 2 +-
src/decode-gre.c | 6 +-
src/decode-icmpv4.c | 14 +-
src/decode-icmpv6.c | 26 +-
src/decode-ipv4.c | 62 ++--
src/decode-ipv6.c | 14 +-
src/decode-ppp.c | 8 +-
src/decode-pppoe.c | 10 +-
src/decode-raw.c | 6 +-
src/decode-tcp.c | 8 +-
src/decode-vlan.c | 6 +-
src/decode.c | 2 +-
src/defrag-hash.c | 4 +-
src/defrag.c | 10 +-
src/detect-ack.c | 2 +-
src/detect-app-layer-event.c | 2 +-
src/detect-asn1.c | 2 +-
src/detect-byte-extract.c | 2 +-
src/detect-bytejump.c | 4 +-
src/detect-bytetest.c | 4 +-
src/detect-content.c | 4 +-
src/detect-csum.c | 4 +-
src/detect-depth.c | 2 +-
src/detect-detection-filter.c | 4 +-
src/detect-distance.c | 2 +-
src/detect-dsize.c | 4 +-
src/detect-engine-address.c | 10 +-
src/detect-engine-event.c | 4 +-
src/detect-engine-iponly.c | 12 +-
src/detect-engine-mpm.c | 6 +-
src/detect-engine-port.c | 9 +-
src/detect-engine-proto.c | 2 +-
src/detect-engine-siggroup.c | 4 +-
src/detect-engine-state.c | 4 +-
src/detect-engine-tag.c | 2 +-
src/detect-engine-threshold.c | 2 +-
src/detect-engine.c | 8 +-
src/detect-fast-pattern.c | 2 +-
src/detect-fileext.c | 10 +-
src/detect-filemagic.c | 18 +-
src/detect-filemd5.c | 2 +-
src/detect-filename.c | 18 +-
src/detect-filesize.c | 4 +-
src/detect-filestore.c | 2 +-
src/detect-flags.c | 28 +-
src/detect-flow.c | 2 +-
src/detect-flowbits.c | 18 +-
src/detect-flowint.c | 10 +-
src/detect-flowvar.c | 4 +-
src/detect-fragbits.c | 6 +-
src/detect-fragoffset.c | 4 +-
src/detect-ftpbounce.c | 2 +-
src/detect-icmp-id.c | 4 +-
src/detect-icmp-seq.c | 2 +-
src/detect-icode.c | 2 +-
src/detect-id.c | 6 +-
src/detect-ipopts.c | 6 +-
src/detect-ipproto.c | 4 +-
src/detect-isdataat.c | 2 +-
src/detect-itype.c | 2 +-
src/detect-l3proto.c | 8 +-
src/detect-luajit.c | 4 +-
src/detect-mark.c | 4 +-
src/detect-msg.c | 4 +-
src/detect-offset.c | 2 +-
src/detect-parse.c | 18 +-
src/detect-pcre.c | 2 +-
src/detect-pktvar.c | 4 +-
src/detect-reference.c | 2 +-
src/detect-replace.c | 4 +-
src/detect-rev.c | 2 +-
src/detect-rpc.c | 2 +-
src/detect-seq.c | 2 +-
src/detect-sid.c | 2 +-
src/detect-ssh-proto-version.c | 2 +-
src/detect-ssh-software-version.c | 2 +-
src/detect-ssl-version.c | 6 +-
src/detect-stream_size.c | 8 +-
src/detect-tag.c | 2 +-
src/detect-threshold.c | 4 +-
src/detect-tls-version.c | 6 +-
src/detect-tls.c | 18 +-
src/detect-tos.c | 2 +-
src/detect-ttl.c | 6 +-
src/detect-uricontent.c | 4 +-
src/detect-urilen.c | 4 +-
src/detect-window.c | 2 +-
src/detect-within.c | 2 +-
src/detect.c | 102 +++---
src/flow-alert-sid.c | 2 +-
src/flow-bit.c | 2 +-
src/flow-util.c | 4 +-
src/flow-var.c | 4 +-
src/flow.c | 2 +-
src/host.c | 4 +-
src/log-droplog.c | 4 +-
src/log-file.c | 4 +-
src/log-filestore.c | 4 +-
src/log-httplog.c | 8 +-
src/log-pcap.c | 9 +-
src/log-tlslog.c | 6 +-
src/output.c | 2 +-
src/pkt-var.c | 2 +-
src/runmode-af-packet.c | 2 +-
src/runmode-erf-file.c | 6 +-
src/runmode-napatech.c | 57 +++-
src/runmode-pcap-file.c | 12 +-
src/runmode-pcap.c | 2 +-
src/runmode-pfring.c | 4 +-
src/runmodes.c | 10 +-
src/source-af-packet.c | 4 +-
src/source-erf-dag.c | 5 +-
src/source-erf-file.c | 5 +-
src/source-napatech.c | 5 +-
src/source-pcap-file.c | 2 +-
src/source-pcap.c | 5 +-
src/source-pfring.c | 2 +-
src/stream-tcp-inline.c | 14 +-
src/stream-tcp-reassemble.c | 44 ++--
src/stream-tcp-sack.c | 10 +-
src/stream-tcp.c | 74 +++---
src/stream.c | 2 +-
src/suricata.c | 7 +-
src/tm-queues.c | 2 +-
src/tm-threads.c | 6 +-
src/tmqh-flow.c | 4 +-
src/tmqh-packetpool.c | 2 +-
src/util-bloomfilter-counting.c | 2 +-
src/util-bloomfilter.c | 2 +-
src/util-buffer.c | 2 +-
src/util-cuda-handlers.c | 13 +-
src/util-cuda.c | 4 +-
src/util-debug.c | 4 +-
src/util-decode-asn1.c | 2 +-
src/util-device.c | 2 +-
src/util-file.c | 6 +-
src/util-hash.c | 6 +-
src/util-hashlist.c | 6 +-
src/util-magic.c | 3 +
src/util-mpm-ac-bs.c | 2 +-
src/util-mpm-ac-gfbs.c | 2 +-
src/util-mpm-ac.c | 2 +-
src/util-mpm-b2g-cuda.c | 8 +-
src/util-mpm-b2g.c | 4 +-
src/util-mpm-b2gc.c | 2 +-
src/util-mpm-b2gm.c | 4 +-
src/util-mpm-b3g.c | 4 +-
src/util-mpm-wumanber.c | 4 +-
src/util-mpm.c | 4 +-
src/util-pool.c | 10 +-
src/util-profiling-rules.c | 6 +-
src/util-profiling.c | 12 +-
src/util-radix-tree.c | 36 +-
src/util-ringbuffer.c | 4 +-
src/util-rohash.c | 2 +-
src/util-runmodes.c | 49 ++-
src/util-spm-bm.c | 6 +-
src/util-spm.c | 12 +-
src/util-threshold-config.c | 6 +-
src/util-unittest-helper.c | 13 +-
src/util-unittest.c | 2 +-
src/util-var-name.c | 6 +-
src/win32-misc.c | 108 ++++---
src/win32-service.c | 554 ++++++++++++++++----------------
suricata.yaml.in | 13 +
187 files changed, 1135 insertions(+), 954 deletions(-)
create mode 100644 qa/coccinelle/malloc-error-check.cocci
hooks/post-receive
--
OISF
More information about the Oisf-devel
mailing list