Next v7 #1454
Merged
Next v7 #1454
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Coverity: ** CID 1296115: Program hangs (ORDER_REVERSAL) /src/tm-threads.c: 1670 in TmThreadClearThreadsFamily() The problem is with the by default unused '%m' output parameter. To get the thread vars it takes the tv_root_lock. This may already be locked by the calling thread. Also, it could lead to a case of wrong lock order between the tv_root_lock and the thread_store_lock. Very unlikely to happen though. As the %m param isn't really used (by default) this patch just disables it.
Switch statement would contain NOALERT even though this was unreachable.
Fix poor int handling breaking sorts of profiling on long runs where the numbers could get really big.
A typo was causing some freeing tasks not to be executed.
Found by using AFL on suricata.yaml.
Found by AFL on suricata.yaml.
Implement LINKTYPE_NULL for pcap live and pcap file. From: http://www.tcpdump.org/linktypes.html "BSD loopback encapsulation; the link layer header is a 4-byte field, in host byte order, containing a PF_ value from socket.h for the network-layer protocol of the packet. Note that ``host byte order'' is the byte order of the machine on which the packets are captured, and the PF_ values are for the OS of the machine on which the packets are captured; if a live capture is being done, ``host byte order'' is the byte order of the machine capturing the packets, and the PF_ values are those of the OS of the machine capturing the packets, but if a ``savefile'' is being read, the byte order and PF_ values are not necessarily those of the machine reading the capture file." Feature ticket #1445
This was referenced Apr 30, 2015
zrasmor
added a commit
to zrasmor/suricata
that referenced
this pull request
May 24, 2015
zrasmor
added a commit
to zrasmor/suricata
that referenced
this pull request
Jun 3, 2015
zrasmor
added a commit
to zrasmor/suricata
that referenced
this pull request
Jun 3, 2015
inliniac
pushed a commit
that referenced
this pull request
Jun 10, 2015
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Includes: #1453, #1416, #1442, #1443 (partial)
Prscript: