Skip to content

next/1467/20260826/v1 - #16118

Merged
victorjulien merged 2 commits into
OISF:mainfrom
victorjulien:next/1467/20260826/v1
Aug 26, 2026
Merged

next/1467/20260826/v1#16118
victorjulien merged 2 commits into
OISF:mainfrom
victorjulien:next/1467/20260826/v1

Conversation

@victorjulien

Copy link
Copy Markdown
Member

victorjulien and others added 2 commits August 26, 2026 08:00
Setting a cpu-affinity path with --set, like

  --set threading.cpu-affinity.worker-cpu-set.threads=28

creates an intermediate node under cpu-affinity whose val is NULL.

With a legacy list format cpu-affinity, AffinitySetupLoadFromConfig()
red the set name from the node val and passed it to
GetAffinitySetName(), which then dereferenced the NULL pointer.

Address it by simply checking for the NULL.

Ticket: OISF#6735.
The fn to flush the ring is supposed to flush the entire ring buffer but
it only resets the buffer up to the "length" bytes. Fix this calculation
to correctly reflect the number of bytes that need to be reset.

Ticket: 8826

@catenacyber catenacyber left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good staging

Good SV

Waiting on QA+CI

@codecov

codecov Bot commented Aug 26, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 83.05%. Comparing base (7c66954) to head (389700e).
⚠️ Report is 2 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main   #16118      +/-   ##
==========================================
- Coverage   83.06%   83.05%   -0.01%     
==========================================
  Files        1004     1004              
  Lines      277376   277407      +31     
==========================================
+ Hits       230389   230410      +21     
- Misses      46987    46997      +10     
Flag Coverage Δ
fuzzcorpus 61.50% <0.00%> (-0.01%) ⬇️
livemode 18.41% <33.33%> (-0.01%) ⬇️
netns 22.90% <0.00%> (+0.02%) ⬆️
pcap 45.39% <0.00%> (-0.04%) ⬇️
suricata-verify 67.24% <66.66%> (+0.09%) ⬆️
unittests 58.53% <97.22%> (+0.01%) ⬆️

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@suricata-qa

Copy link
Copy Markdown

Information: QA ran without warnings.

Pipeline = 33375

@victorjulien
victorjulien merged commit 389700e into OISF:main Aug 26, 2026
63 of 64 checks passed
@victorjulien
victorjulien deleted the next/1467/20260826/v1 branch August 26, 2026 15:54
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.

4 participants