Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

next/271/70x/20240125/v1 #10253

Merged
merged 10 commits into from
Jan 25, 2024

Conversation

sfd and others added 10 commits January 25, 2024 13:18
Bug: OISF#6618.

Fix Endace ERF to SCTime_t timestamp conversion

Fix typo preventing compilation with --enable-dag

(cherry picked from commit 879db3d)
Bug: OISF#6667.

Fix compiler warnings for function pointer parameters missing const with --enable-dag

(cherry picked from commit c28cc93)
Ticket: 6656
(cherry picked from commit d321838)
The shutdown(2) syscall would always return ENOTCONN for FreeBSD 11,
FreeBSD 12, FreeBSD 13 and FreeBSD 14.  It could do some action on the
socket in the kernel in FreeBSD 10 and before, did not test.

(cherry picked from commit b239e88)
When running Suricata in XDP bypass mode (bypass: yes),

Suricata started up with error:
Error: threads: thread "FB" failed to start in time: flags 0003

"FB" thread does not transition from THV_INIT_DONE to THV_RUNNING.

Set "FB" thread THV_RUNNING state in BypassedFlowManager().

Bug: OISF#6254

Signed-off-by: Vincent Li <[email protected]>
(cherry picked from commit f80d26d)
Previous integration of hugepage analysis only fetched data
from /proc/meminfo. However this proved to be often
deceiving mainly for providing only global information and
not taking into account different hugepage sizes (e.g. 1GB
hugepages) and different NUMA nodes.

Ticket: OISF#6697
(cherry picked from commit ca6f7c2)
Remove references that are mentioning Suricata 3 or less
As a note - only one Suricata 4 reference found:
(suricata-yaml.rst:"In 4.1.x")
Fast pattern selection criteria can be internally found by inspecting
SupportFastPatternForSigMatchList and SigTableSetup functions.

Ticket: OISF#6699
(cherry picked from commit 6e4cc79)
Move to libhtp to the 0.5.x branch instead of 0.5.45.

(cherry picked from commit c3b3c11)
"sigerror_ok" and "sigerror_requires" were not being reset after each
rule which could lead to a rule load error being incorrectly tracked
as skipped rather than failed.

Also initialize "skippedsigs" to 0 along with "goodsigs" and
"badsigs", while not directly related to this issue, could also throw
off some stats.

Ticket: OISF#6710
(cherry picked from commit de3cbe4)
@victorjulien victorjulien requested review from jufajardini and a team as code owners January 25, 2024 15:41
Copy link

codecov bot commented Jan 25, 2024

Codecov Report

Attention: 88 lines in your changes are missing coverage. Please review.

Comparison is base (6e9d790) 82.17% compared to head (cc6319b) 82.21%.

Additional details and impacted files
@@              Coverage Diff               @@
##           main-7.0.x   #10253      +/-   ##
==============================================
+ Coverage       82.17%   82.21%   +0.04%     
==============================================
  Files             974      975       +1     
  Lines          274579   274789     +210     
==============================================
+ Hits           225639   225923     +284     
+ Misses          48940    48866      -74     
Flag Coverage Δ
fuzzcorpus 63.29% <1.94%> (+0.03%) ⬆️
suricata-verify 61.20% <59.70%> (+0.03%) ⬆️
unittests 62.89% <1.42%> (-0.03%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

6 participants