]> git.ipfire.org Git - thirdparty/suricata.git/log
thirdparty/suricata.git
5 years agokerberos: fix against packet split in record size 4829/head
Philippe Antoine [Fri, 6 Mar 2020 09:45:23 +0000 (10:45 +0100)] 
kerberos: fix against packet split in record size

(cherry picked from commit 23f796a021cd4a0f2614418a5d2d40acefd56df3)

5 years agodetect/parse: properly free bidir sigs in error path
Victor Julien [Fri, 10 Apr 2020 08:02:43 +0000 (10:02 +0200)] 
detect/parse: properly free bidir sigs in error path

(cherry picked from commit fc6ada85411caa9c08df3eae1cc908436a4ea257)

5 years agodetect/parse: fix minor memory leak in error path
Victor Julien [Fri, 10 Apr 2020 07:55:36 +0000 (09:55 +0200)] 
detect/parse: fix minor memory leak in error path

Only reachable on SCMalloc so should be unlikely to be reached.

(cherry picked from commit 5abead93259e8d0bfb3f7556b9653debe320621a)

5 years agodetect/iponly: fix parsing of '0' valued netmask
Victor Julien [Sat, 11 Apr 2020 11:54:00 +0000 (13:54 +0200)] 
detect/iponly: fix parsing of '0' valued netmask

(cherry picked from commit 4d50eb1647709c9f2b8809f91b2af67be99ce4ab)

5 years agoconf/yaml: limit recursion depth while paring YAML
Jason Ish [Thu, 9 Apr 2020 21:59:23 +0000 (15:59 -0600)] 
conf/yaml: limit recursion depth while paring YAML

A deeply nested YAML file can cause a stack-overflow while
reading in the configuration to do the recursive parser. Limit
the recursion level to something sane (128) to prevent this
from happening.

The default Suricata configuration has a recursion level of 128
so there is still lots of room to grow (not that we should).

Redmine ticket:
https://redmine.openinfosecfoundation.org/issues/3630

(cherry picked from commit 4dc80a6e6f9b396de5dc25d3468522316c4661d0)

5 years agonfs: fix buffering code using wrong dir 4804/head
Victor Julien [Fri, 20 Mar 2020 08:40:23 +0000 (09:40 +0100)] 
nfs: fix buffering code using wrong dir

5 years agodetect/tls: Use pcre_copy_substring to avoid leak 4791/head
Jeff Lucovsky [Mon, 30 Mar 2020 11:57:36 +0000 (07:57 -0400)] 
detect/tls: Use pcre_copy_substring to avoid leak

This commit eliminates a memory leak while parsing TLS version
information. The leak was identified through fuzzing.

(cherry picked from commit 2823bc5aed3ade2f916a9592c0ecf214bb62481b)

5 years agodetect/ssl: Fix memory leak in version parsing
Jeff Lucovsky [Mon, 6 Apr 2020 13:55:41 +0000 (09:55 -0400)] 
detect/ssl: Fix memory leak in version parsing

This commit fixes a memory leak in the SSL version handling that
manifests when the version identifier is incomplete or incorrect.

(cherry picked from commit 6bffe0bd353654b0f2e5e123cd3f68d2570c5553)

5 years agodetect/pktvar: fix memory leaks
Victor Julien [Sun, 5 Apr 2020 14:56:35 +0000 (16:56 +0200)] 
detect/pktvar: fix memory leaks

(cherry picked from commit aba4e195484a4ee2068ca13ed7852aab81f00d5a)

5 years agodetect/threshold: Correct typos
Jeff Lucovsky [Wed, 4 Mar 2020 14:37:04 +0000 (09:37 -0500)] 
detect/threshold: Correct typos

(cherry picked from commit c20ab53eaeb57d873a5ea065f31adcec28786078)

5 years agodetect/threshold: Don't allow duplicates
Jeff Lucovsky [Wed, 4 Mar 2020 14:35:54 +0000 (09:35 -0500)] 
detect/threshold: Don't allow duplicates

This commit detects duplicate threshold rule options. When duplicates
are found in a rule, an error message is displayed and the rule is
rejected.

(cherry picked from commit ff9a01ee1b63452d1b047f9bcc7522e3ab1eda10)

5 years agosip: address trailing space parsing
Sascha Steinbiss [Mon, 17 Feb 2020 16:29:59 +0000 (17:29 +0100)] 
sip: address trailing space parsing

(cherry picked from commit 11912bd71517408000f70e68407571dff3be449a)

5 years agosnmp-version: make comment more clear
Sascha Steinbiss [Thu, 20 Feb 2020 09:47:32 +0000 (10:47 +0100)] 
snmp-version: make comment more clear

(cherry picked from commit efaa1755c636a11ef509b5e951b20c56fd36bf5b)

5 years agosnmp: do not set SIGMATCH_NOOPT
Sascha Steinbiss [Thu, 20 Feb 2020 09:46:55 +0000 (10:46 +0100)] 
snmp: do not set SIGMATCH_NOOPT

(cherry picked from commit f02a18e55747b40950a79095b930095407cc97b8)

5 years agopcap/file: improve time handling 4779/head
Victor Julien [Fri, 28 Feb 2020 12:17:03 +0000 (13:17 +0100)] 
pcap/file: improve time handling

This patch addresses two problems.

First, various parts of the engine, but most notably the flow manager (FM),
use a minimum of the time notion of the packet threads. This did not
however, take into account the scenario where one or more of these
threads would be inactive for prolonged times. This could lead to the
time used by the FM could get stale.

This is addressed by keeping track of the last time the per thread packet
timestamp was updated, and only considering it for the 'minimum' when it
is reasonably current.

Second, there was a minor race condition at start up, where the FM would
already inspect the hash table(s) while the packet threads weren't active
yet. Since FM gets the time from the packet threads, it would use a bogus
time of 0.

This is addressed by adding a wait loop to the start of the FM that waits
for 'time' to get ready.

(cherry picked from commit 1e9333288f06ddc2f469053205a5d6662bf32ed7)

5 years agothreads/time: rename ts to pktts to make purpose clear
Victor Julien [Fri, 28 Feb 2020 12:06:09 +0000 (13:06 +0100)] 
threads/time: rename ts to pktts to make purpose clear

(cherry picked from commit b60520503247f31c9c58157f67d2f901cfb23d93)

5 years agopcap/file: fix race during pcap processing start
Victor Julien [Thu, 27 Feb 2020 16:20:18 +0000 (17:20 +0100)] 
pcap/file: fix race during pcap processing start

A race condition during the start of pcap file processing could cause
missed alerts and logged events. This race happens between the packet
threads and the flow manager. It was observed on slower hardware, but in
theory could happen on any machine. It required the 'autofp' runmode.

In commit 6f560144c1b9 ("time: improve offline time handling") the logic
was added to make the flow manager use a minimum of all the packet threads
perception of time.

The race condition was that the flow manager may become active _before_
all of the packet threads have started processing packets and thus setting
their timestamp. The threads that had not yet initialized their timestamp
would not be considered when calculating the minimum.

As a result of this, older packets timestamps would not yet be registered.
This would give the Flow Manager a timestamp too far in the future. While
the FM was running, the packet processing would start and a flow would
be created. This flow would then immediately be considered 'timed out' by
the FM, due to the timestamp too far in the future.

In the observed case, the thread processing packet 1 from the pcap had not
yet started processing while other threads had already started. The FM was
also already active. Due to the timestamps in the pcap this meant that the
time the FM used was about 500 seconds in the future compared to packet 1.

This patch fixes the issue by initializing all of the threads timestamps
with the timestamp value of the first packet. This way the minimum will
always consider this timestamp.

(cherry picked from commit 9f1922e1756017b66c7161d49202a4120dd7f231)

5 years agopcap/file: fix function ptr naming
Victor Julien [Fri, 28 Feb 2020 09:38:22 +0000 (10:38 +0100)] 
pcap/file: fix function ptr naming

(cherry picked from commit 7f211dfb671e49de6b47ea322fc3f04f91995696)

5 years agotime: fix function name typo
Victor Julien [Fri, 28 Feb 2020 09:22:23 +0000 (10:22 +0100)] 
time: fix function name typo

(cherry picked from commit a765494dcb6ff696daa8aeffe9595177b1772173)

5 years agotime: remove unused time structure
Victor Julien [Thu, 27 Feb 2020 19:27:20 +0000 (20:27 +0100)] 
time: remove unused time structure

(cherry picked from commit c68af5a23e183d4a6aa2aabf833062ecbe8c2447)

5 years agotime: minor code cleanup
Victor Julien [Thu, 27 Feb 2020 19:20:33 +0000 (20:20 +0100)] 
time: minor code cleanup

(cherry picked from commit 0325d185a85d69e10bf9e41af17d205097360b47)

5 years agostream/tcp: fix fast open off by one
Victor Julien [Thu, 19 Mar 2020 20:30:45 +0000 (21:30 +0100)] 
stream/tcp: fix fast open off by one

With data on SYN the sequence number used for the first data
was off by one, leading to the next segments to appear to come
after a one byte gap.

(cherry picked from commit b85539b2aba4cc95a2773b71da44821cd225b50a)

5 years agosmb: fix rustc 1.42 warnings
Victor Julien [Tue, 17 Mar 2020 19:44:33 +0000 (20:44 +0100)] 
smb: fix rustc 1.42 warnings

(cherry picked from commit a729d266c398d0d3a9f43d7df3f351245d1773e3)

5 years agodetect/parse: fix crash on 'internal' keyword use
Victor Julien [Tue, 31 Mar 2020 12:04:07 +0000 (14:04 +0200)] 
detect/parse: fix crash on 'internal' keyword use

When keyword __flowvar__postmatch__, an internal keyword, is used
in a rule the 'Setup' func ptr will be NULL. This caused a crash.

(cherry picked from commit 095981cb2a7b204e66770ab5ab4efcf5034caa27)

5 years agodetect/pkt_data: code and test cleanup
Victor Julien [Tue, 31 Mar 2020 09:37:51 +0000 (11:37 +0200)] 
detect/pkt_data: code and test cleanup

(cherry picked from commit e1c474a1b08eb31e53c455cd7a14c64d8af96acc)

5 years agodetect/pkt_data: error on unconsumed transforms
Victor Julien [Tue, 31 Mar 2020 08:38:06 +0000 (10:38 +0200)] 
detect/pkt_data: error on unconsumed transforms

If a rule has transforms w/o consuming them (e.g. a content keyword),
don't consider 'pkt_data' valid.

(cherry picked from commit 13c9d0ca7e3a41a8023dc80def36e24686288742)

5 years agodetect: more robust against transform issues
Victor Julien [Tue, 31 Mar 2020 08:35:54 +0000 (10:35 +0200)] 
detect: more robust against transform issues

In case of transform issues (transform not consumed before pkt_data
for example), the code would hit an ugly BUG_ON.

Address this by a more graceful error message, that will still
invalidate the sig but not crash the engine.

(cherry picked from commit 7f19da1cc0956a36982b6027e8bce517ca447609)

5 years agotests/bsize: Fuzzing test case added
Jeff Lucovsky [Tue, 31 Mar 2020 12:46:38 +0000 (08:46 -0400)] 
tests/bsize: Fuzzing test case added

This commit adds a test case to validate the issue found during fuzz
testing.

(cherry picked from commit 0ae6b0b2503f6e50ee876f27627b071734a3b757)

5 years agodetect/bsize: Ensure numeric values fit
Jeff Lucovsky [Mon, 30 Mar 2020 13:51:27 +0000 (09:51 -0400)] 
detect/bsize: Ensure numeric values fit

This commit ensures that the numeric values will not exceed the size of
the containers used to hold them.

(cherry picked from commit 5b38bc989492672277178e93b8685b9e63fe6ec8)

5 years agodecode/teredo: implement port support
Victor Julien [Mon, 23 Mar 2020 10:06:55 +0000 (11:06 +0100)] 
decode/teredo: implement port support

Implement support for limiting Teredo detection and decoding to specific
UDP ports, with 3544 as the default.

If no ports are specified, the old behaviour of detecting/decoding on any
port is still in place. This can also be forced by specifying 'any' as the
port setting.

(cherry picked from commit e97cdb48f3e32e8d76aaa2f7325a1a67e245be8e)

5 years agoconfigure: correctly display nss/nspr status
Eric Leblond [Tue, 11 Feb 2020 14:21:39 +0000 (16:21 +0200)] 
configure: correctly display nss/nspr status

If autodiscovery of libnss was used (default), then the line
 libnss support:                          yes
was never set to no.

Same behavior for libnspr.

Broken by commit 'configure: fix nspr check logic' (7ea269a212a3a2209effc3cc9300873d6a06859e)

(cherry picked from commit 752fc77cdcd0f74d5a7d7b8061b04b482a83c728)

5 years agostream/tcp: fix STREAM_HAS_SEEN_DATA macro
Victor Julien [Tue, 24 Mar 2020 12:11:03 +0000 (13:11 +0100)] 
stream/tcp: fix STREAM_HAS_SEEN_DATA macro

The macro would not return true for smaller TCP streams, leading to
cases where the app-layer was not notified of EOF.

(cherry picked from commit e500c59b994ef2c4ba1c2bd17b4d4ff674a144ef)

5 years agoactions: Use newer checkout action for some 4727/head 4728/head
Jeff Lucovsky [Mon, 23 Mar 2020 17:57:32 +0000 (13:57 -0400)] 
actions: Use newer checkout action for some

Per-@jason, use action `checkout@v2` for CentOS-8, Debian 10 and Ubuntu
18.04

5 years agodoc: Remove bitmask documentation
Jeff Lucovsky [Mon, 23 Mar 2020 13:08:14 +0000 (09:08 -0400)] 
doc: Remove bitmask documentation

This commit removes documentation for the never-implemented bitmask
option for the `byte_jump` and `byte_test` keywords.

5 years agodoc: adds doc for ipv4.hdr signature keyword
Philippe Antoine [Thu, 12 Mar 2020 08:11:52 +0000 (09:11 +0100)] 
doc: adds doc for ipv4.hdr signature keyword

(cherry picked from commit 0715e1352f38af4fd51660ba2cd3e584fec7f98f)

5 years agodetect/parse: move spaces skip up the stack 4718/head
Philippe Antoine [Wed, 9 Oct 2019 14:59:13 +0000 (16:59 +0200)] 
detect/parse: move spaces skip up the stack

Switch to isspace() as well.

(cherry picked from commit 52970d850858bb9784fe562422e9cf2c3aec4230)

5 years agodecode/erspan: ERSPAN TypeI configurable
Jeff Lucovsky [Tue, 3 Mar 2020 13:50:37 +0000 (08:50 -0500)] 
decode/erspan: ERSPAN TypeI configurable

For the backport, ERSPAN TypeI decode is

1. Disabled by default
2. Configurable: `decoder.erspan_typeI.enabled`

(cherry picked from commit ae6beedd13df60b129de702eabc0a7364fd973d5)

5 years agodecode: Handle ERSPAN Type I
Jeff Lucovsky [Sat, 28 Dec 2019 14:44:56 +0000 (09:44 -0500)] 
decode: Handle ERSPAN Type I

(cherry picked from commit aec4e9a032855a710d71a4c397affcdce5351b39)
(cherry picked from commit e00de3dce36b0bc6a912e3754e430908fdcd231a)

5 years agodecode: Fix typos/spelling
Jeff Lucovsky [Sat, 28 Dec 2019 14:45:31 +0000 (09:45 -0500)] 
decode: Fix typos/spelling

(cherry picked from commit 427ec4e739611975b983fcf06bec8fc9b8f8917e)
(cherry picked from commit ed6c976bb0c945ae47169be8e65d354c69514389)

5 years agodoc: Correct RST quote usage
Jeff Lucovsky [Sat, 22 Feb 2020 18:19:28 +0000 (13:19 -0500)] 
doc: Correct RST quote usage

Corrects misplaced backticks preventing proper formatting of `mpm-algo`
section.

(cherry picked from commit 8c132c0b8746ee2b91693c54625076e6a3be123e)

5 years agodetect/filestore: Fix memory leaks from pcre_get_substring
Jeff Lucovsky [Sat, 22 Feb 2020 18:21:36 +0000 (13:21 -0500)] 
detect/filestore: Fix memory leaks from pcre_get_substring

This commit replaces usages of pcre_get_substring with
pcre_copy_substring to avoid leaking memory on error conditions.

(cherry picked from commit c2071e1c4e2d2ff89f7f7e07cefb307c095338e3)

5 years agodetect/flowvar: Fix memory leaks from pcre_get_substring
Jeff Lucovsky [Sat, 22 Feb 2020 18:23:04 +0000 (13:23 -0500)] 
detect/flowvar: Fix memory leaks from pcre_get_substring

This commit replaces usages of pcre_get_substring with
pcre_copy_substring to avoid leaking memory on error conditions.

(cherry picked from commit 9fe51a8bd280c3662d5b48bbd9c8745a7bdd0822)

5 years agodetect/ssl_state: Fix memory leaks from pcre_get_substring
Jeff Lucovsky [Sat, 22 Feb 2020 18:24:13 +0000 (13:24 -0500)] 
detect/ssl_state: Fix memory leaks from pcre_get_substring

This commit replaces usages of pcre_get_substring with
pcre_copy_substring to avoid leaking memory on error conditions.

(cherry picked from commit 6c3503932ff604443820b85421ef0271deaf7032)

5 years agospelling: Fix spelling error
Jeff Lucovsky [Sat, 22 Feb 2020 18:24:45 +0000 (13:24 -0500)] 
spelling: Fix spelling error

(cherry picked from commit 6d94b096a9bdf069465aae447aea036609bfb9bb)

5 years agoutil-error: define SC_ERR_PCRE_COPY_SUBSTRING
Jeff Lucovsky [Sat, 22 Feb 2020 18:25:02 +0000 (13:25 -0500)] 
util-error: define SC_ERR_PCRE_COPY_SUBSTRING

(cherry picked from commit bcea73026635c3bf080d9dab1717077acc23c5f2)

5 years agomime: Test cases for filename length limit
Jeff Lucovsky [Fri, 14 Feb 2020 13:38:53 +0000 (08:38 -0500)] 
mime: Test cases for filename length limit

(cherry picked from commit c92975e22b809e9f4121b653670ae1233fe3e567)

5 years agosmtp/mime: Fix typos
Jeff Lucovsky [Wed, 5 Feb 2020 14:21:05 +0000 (09:21 -0500)] 
smtp/mime: Fix typos

(cherry picked from commit 9a33b5d5ded247e94a6572092ab2aca3f51752b3)

5 years agosmtp/mime: Set event when name exceeds limit
Jeff Lucovsky [Wed, 5 Feb 2020 14:20:29 +0000 (09:20 -0500)] 
smtp/mime: Set event when name exceeds limit

(cherry picked from commit 130b8d26e7e8e64ca42dc7e4db9890619d9730aa)

5 years agosmtp/mime: Restrict file name lengths
Jeff Lucovsky [Tue, 4 Feb 2020 15:13:49 +0000 (10:13 -0500)] 
smtp/mime: Restrict file name lengths

This commit places restrictions on the length of the file name specified
in attachments (`name=` or `filename=`) to `NAME_MAX`. Names exceeding
these limits will be truncated and processing will continue with the
truncated name.

(cherry picked from commit d0d20bd8746ad8933a515fa4facf9e3e10f22ecc)

5 years agodag: Skip over ERF_TYPE_META records
Stephen Donnelly [Thu, 5 Mar 2020 21:49:17 +0000 (10:49 +1300)] 
dag: Skip over ERF_TYPE_META records

Suricata generates an error on unrecognised ERF types.
Suricata should ignore ERF 'Provenance' records with ERF_TYPE_META.

(cherry picked from commit 47082dd5df1b71485333039cd6af75b39cdfffeb)

5 years agostream: fix direction flags in corner case
Victor Julien [Tue, 17 Mar 2020 12:08:33 +0000 (13:08 +0100)] 
stream: fix direction flags in corner case

When a TCP DNS flow would start with a GAP on the TS side, the successful
protocol detection on the TC side would trigger 'opposing side' reassembly
and app-layer processing. In this case the stream flags would indicate the
wrong direction and the wrong parser would be called.

(cherry picked from commit efee458af8a711323d74045af67b1fa9b648569c)

5 years agoversion: starting work on 5.0.3
Victor Julien [Thu, 13 Feb 2020 13:43:59 +0000 (14:43 +0100)] 
version: starting work on 5.0.3

5 years agoversion: release 5.0.2 suricata-5.0.2
Victor Julien [Thu, 13 Feb 2020 10:57:47 +0000 (11:57 +0100)] 
version: release 5.0.2

5 years agochangelog: update for 5.0.2
Victor Julien [Thu, 13 Feb 2020 10:57:04 +0000 (11:57 +0100)] 
changelog: update for 5.0.2

5 years agostream/reassembly: fix data overlap check
vanlink [Thu, 16 Jan 2020 08:27:57 +0000 (16:27 +0800)] 
stream/reassembly: fix data overlap check

Fix function CheckOverlap bug.

(cherry picked from commit 2456f27d08142b571a06ffd211c90a5fa557366a)

5 years agonfs: implement post-GAP transaction cleanup 4545/head
Victor Julien [Tue, 11 Feb 2020 10:55:18 +0000 (11:55 +0100)] 
nfs: implement post-GAP transaction cleanup

Close all prior transactions in the direction of the GAP, except the
file xfers. Those use their own logic described below.

After a GAP all normal transactions are closed. File transactions
are left open as they can handle GAPs in principle. However, the
GAP might have contained the closing of a file and therefore it
may remain active until the end of the flow.

This patch introduces a time based heuristic for these transactions.
After the GAP all file transactions are stamped with the current
timestamp. If 60 seconds later a file has seen no update, its marked
as closed.

This is meant to fix resource starvation issues observed in long
running SMB sessions where packet loss was causing GAPs. Due to the
similarity of the NFS and SMB parsers, this issue is fixed for NFS
as well in this patch.

Bug #3424.
Bug #3425.

(cherry picked from commit f68c255f090a94162df1fcd7e7262548a2119c50)

5 years agotls: fix missing extern logic for cert_id tracking 4541/head
Victor Julien [Wed, 29 Jan 2020 12:50:05 +0000 (13:50 +0100)] 
tls: fix missing extern logic for cert_id tracking

5 years agostats: fix missing extern keyword
Victor Julien [Wed, 29 Jan 2020 12:46:56 +0000 (13:46 +0100)] 
stats: fix missing extern keyword

5 years agodefrag: fix use of globals
Victor Julien [Wed, 29 Jan 2020 12:43:49 +0000 (13:43 +0100)] 
defrag: fix use of globals

5 years agothreading: fix queue handlers globals use
Victor Julien [Wed, 29 Jan 2020 12:30:35 +0000 (13:30 +0100)] 
threading: fix queue handlers globals use

5 years agohtp: fix globals use for flags
Victor Julien [Wed, 29 Jan 2020 12:28:17 +0000 (13:28 +0100)] 
htp: fix globals use for flags

5 years agoproto: fix globals use
Victor Julien [Wed, 29 Jan 2020 12:27:58 +0000 (13:27 +0100)] 
proto: fix globals use

5 years agoflow: fix global variable use
Victor Julien [Wed, 29 Jan 2020 12:23:36 +0000 (13:23 +0100)] 
flow: fix global variable use

5 years agostream: fix global declaration of the config
Victor Julien [Wed, 29 Jan 2020 10:55:27 +0000 (11:55 +0100)] 
stream: fix global declaration of the config

5 years agothreading/modules: fix global declarations
Victor Julien [Wed, 29 Jan 2020 10:51:11 +0000 (11:51 +0100)] 
threading/modules: fix global declarations

5 years agoippair: fix global declarations
Victor Julien [Wed, 29 Jan 2020 09:56:54 +0000 (10:56 +0100)] 
ippair: fix global declarations

5 years agohost: fix global declarations
Victor Julien [Wed, 29 Jan 2020 09:37:44 +0000 (10:37 +0100)] 
host: fix global declarations

5 years agompm: fix global declarations
Victor Julien [Wed, 29 Jan 2020 09:28:16 +0000 (10:28 +0100)] 
mpm: fix global declarations

5 years agodetect: fix global declaration of sigmatch_table
Victor Julien [Wed, 29 Jan 2020 09:22:57 +0000 (10:22 +0100)] 
detect: fix global declaration of sigmatch_table

5 years agospm: fix global declaration of spm_table
Victor Julien [Wed, 29 Jan 2020 09:11:54 +0000 (10:11 +0100)] 
spm: fix global declaration of spm_table

5 years agothreading: fix global declaration of threading_set_cpu_affinity
Victor Julien [Wed, 29 Jan 2020 07:33:18 +0000 (08:33 +0100)] 
threading: fix global declaration of threading_set_cpu_affinity

5 years agothreading: fix global declaration of trans_q
Victor Julien [Wed, 29 Jan 2020 07:27:43 +0000 (08:27 +0100)] 
threading: fix global declaration of trans_q

5 years agounix-socket: avoid using global variable w/o extern
Victor Julien [Wed, 29 Jan 2020 07:15:21 +0000 (08:15 +0100)] 
unix-socket: avoid using global variable w/o extern

5 years agodecode: fix default-packet-size global variable
Victor Julien [Wed, 29 Jan 2020 07:10:59 +0000 (08:10 +0100)] 
decode: fix default-packet-size global variable

5 years agoinit: Fix dropping privileges in nflog runmode 4534/head
Timo Sigurdsson [Mon, 3 Feb 2020 22:17:17 +0000 (23:17 +0100)] 
init: Fix dropping privileges in nflog runmode

Using the run-as configuration option with the nflog capture method
results in the following error during the startup of suricata:
[ERRCODE: SC_ERR_NFLOG_BIND(248)] - nflog_bind_pf() for AF_INET failed

This is because SCDropMainThreadCaps does not have any capabilities
defined for the nflog runmode (unlike other runmodes). Therefore, apply
the same capabilities to the nflog runmode that are already defined for
the nfqueue runmode. This has been confirmed to allow suricata start
and drop its privileges in the nflog runmode.

Fixes redmine issue #3265.

Signed-off-by: Timo Sigurdsson <public_timo.s@silentcreek.de>
(cherry picked from commit 1262ecbde0c2130f3fd4ca336cd2646828de9391)

5 years agoafl: fix compilation
Victor Julien [Fri, 7 Feb 2020 13:50:39 +0000 (14:50 +0100)] 
afl: fix compilation

(cherry picked from commit f05c12b70f78d5369ec19c5759db033fb103f052)

5 years agodefrag: set livedev on the reassembled packet (issue-3380) 4528/head
Jason Ish [Thu, 23 Jan 2020 17:31:06 +0000 (11:31 -0600)] 
defrag: set livedev on the reassembled packet (issue-3380)

Set the livedev on reassembled packets to that of the parent
packet. Fixes issues with multidetect, specifically a segfault
as reported in issue 3380.

Bug #3380.

(cherry picked from commit d1eab5aa462f18f66ada9e5bbc9c89b8104db96a)

5 years agorust/rpc: add partial data test
Victor Julien [Thu, 6 Feb 2020 10:43:55 +0000 (10:43 +0000)] 
rust/rpc: add partial data test

5 years agosmb: handle file transactions post-GAP 4509/head
Victor Julien [Tue, 21 Jan 2020 11:20:40 +0000 (12:20 +0100)] 
smb: handle file transactions post-GAP

After a GAP all normal transactions are closed. File transactions
are left open as they can handle GAPs in principle. However, the
GAP might have contained the closing of a file and therefore it
may remain active until the end of the flow.

This patch introduces a time based heuristic for these transactions.
After the GAP all file transactions are stamped with the current
timestamp. If 60 seconds later a file has seen no update, its marked
as closed.

This is meant to fix resource starvation issues observed in long
running SMB sessions where packet loss was causing GAPs.

5 years agoflow: expose last time as a function
Jason Ish [Tue, 3 Dec 2019 20:10:45 +0000 (14:10 -0600)] 
flow: expose last time as a function

This function returns the individual components
of the timeval in output pointers making it suitable
for use over Rust FFI.

5 years agostreaming/api: fix overlap check 4492/head
Victor Julien [Sat, 14 Dec 2019 19:20:45 +0000 (20:20 +0100)] 
streaming/api: fix overlap check

In some cases a SBB could be seen as overlapping with the requested
offset, when it was in fact precisely before it. In some special cases
this could lead to the stream engine not progressing the 'raw' progress.

5 years agodebug/validation: check tcp/app-layer data lengths
Victor Julien [Sat, 14 Dec 2019 06:11:26 +0000 (07:11 +0100)] 
debug/validation: check tcp/app-layer data lengths

5 years agostream: improve app-layer data retrieval with GAPs
Victor Julien [Fri, 13 Dec 2019 21:26:30 +0000 (22:26 +0100)] 
stream: improve app-layer data retrieval with GAPs

Don't assume that the next block after the sbb head is after the
requested offset.

If the next block was before the offset, the returned data_len
would underflow and return a nonsense value to the app-layer.

Bug #2993.

5 years agomodbus: Correct typo
Jeff Lucovsky [Sat, 11 Jan 2020 14:51:00 +0000 (09:51 -0500)] 
modbus: Correct typo

5 years agomodbus: Update correct TX flags
Jeff Lucovsky [Sat, 11 Jan 2020 14:49:55 +0000 (09:49 -0500)] 
modbus: Update correct TX flags

5 years agoanalysis: exit if table entries are stale
Jeff Lucovsky [Sat, 4 Jan 2020 14:12:38 +0000 (09:12 -0500)] 
analysis: exit if table entries are stale

This commit causes Suricata to exit when a buffer from the analyzer
table is not recognized.

Since the table must match what's registered, exiting will bring noticed
to the condition.

5 years agorust: fix vendor use on MinGW 4490/head
Victor Julien [Fri, 17 Jan 2020 15:40:38 +0000 (16:40 +0100)] 
rust: fix vendor use on MinGW

5 years agorust: Don't use --frozen during build.
Jason Ish [Thu, 16 Jan 2020 15:30:28 +0000 (09:30 -0600)] 
rust: Don't use --frozen during build.

If sources are vendored, we get the same effect of using frozen
with a lock file, and the Cargo.lock is generated based
on the vendored sources.

This also removes the need to ship a Cargo.lock.

Fixed out of source builds with vendored sources.

5 years agorust/Makefile: Don't include Cargo.toml
Jason Ish [Thu, 16 Jan 2020 15:09:13 +0000 (09:09 -0600)] 
rust/Makefile: Don't include Cargo.toml

There is no need to include Cargo.toml in the distribution,
it is always generated from Cargo.toml.in during
./configure.

5 years agogithub-ci: do distcheck on fedora 31 build
Jason Ish [Wed, 8 Jan 2020 16:16:40 +0000 (10:16 -0600)] 
github-ci: do distcheck on fedora 31 build

There were no distchecks being done on builds from git.

5 years agogithub-ci: make distcheck on centos 7 build
Jason Ish [Tue, 31 Dec 2019 15:19:43 +0000 (09:19 -0600)] 
github-ci: make distcheck on centos 7 build

Tests distcheck on a build from a distribution archive.

5 years agodoc/conf: Update copyright and regex for version
Shivani Bhardwaj [Sat, 21 Dec 2019 00:22:42 +0000 (05:52 +0530)] 
doc/conf: Update copyright and regex for version

Make the new regex in compliance with the modern autoconf syntax.
Closes redmine ticket #3423

5 years agodoc: minor capitalization fix 4460/head
jason taylor [Wed, 18 Dec 2019 14:59:54 +0000 (09:59 -0500)] 
doc: minor capitalization fix

Signed-off-by: jason taylor <jtfas90@gmail.com>
5 years agodoc: add bsize documentation and rule example
jason taylor [Wed, 18 Dec 2019 14:59:23 +0000 (09:59 -0500)] 
doc: add bsize documentation and rule example

Signed-off-by: jason taylor <jtfas90@gmail.com>
5 years agorust: remove unnecessary parentheses (Rust 1.40 fixup) 4457/head
Jason Ish [Thu, 19 Dec 2019 17:02:56 +0000 (11:02 -0600)] 
rust: remove unnecessary parentheses (Rust 1.40 fixup)

Rust 1.40 in strict mode will now fail the build on the
presence of unnecessary parentheses.

warning: unnecessary parentheses around type
  --> src/smb/smb2_ioctl.rs:41:12
   |
41 |         -> (&mut SMBTransaction)
   |            ^^^^^^^^^^^^^^^^^^^^^ help: remove these parentheses
   |
   = note: `#[warn(unused_parens)]` on by default

5 years agogithub-ci: use container for 18.04 build 4444/head
Jason Ish [Fri, 13 Dec 2019 15:14:35 +0000 (09:14 -0600)] 
github-ci: use container for 18.04 build

As the action runs natively on 18.04 we were not explicitly
setting a container, but this means we're using what GitHub
provides us as a default state which might be broken. Instead
use the standard Ubuntu 18.04 container.

5 years agoversion: starting work on 5.0.2
Victor Julien [Fri, 13 Dec 2019 15:49:52 +0000 (16:49 +0100)] 
version: starting work on 5.0.2

5 years agoversion: release 5.0.1 suricata-5.0.1
Victor Julien [Thu, 12 Dec 2019 08:54:45 +0000 (09:54 +0100)] 
version: release 5.0.1

5 years agochangelog: update for 5.0.1
Victor Julien [Fri, 13 Dec 2019 10:09:18 +0000 (11:09 +0100)] 
changelog: update for 5.0.1

5 years agodetect/asn1: fix offset bounds checking
Victor Julien [Sun, 3 Nov 2019 08:50:14 +0000 (09:50 +0100)] 
detect/asn1: fix offset bounds checking