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

netmap: Release lock to avoid deadlock #10349

Closed
wants to merge 1 commit into from
Closed

Conversation

jlucovsky
Copy link
Contributor

Continuation of #10335

Issue: 6755

When NetmapOpen encounters an error opening the netmap device, it'll retry a bit. When the retry limit is reached, it'll shutdown Suricata.

This commit ensures that the device list lock is not held when before closing all open devices before terminating Suricata.

Link to redmine ticket: 6755

Describe changes:

  • Release devlist lock before closing all devices

Updates:

  • Rebase

Provide values to any of the below to override the defaults.

To use a pull request use a branch name like pr/N where N is the
pull request number.

Alternatively, SV_BRANCH may also be a link to an
OISF/suricata-verify pull-request.

SV_REPO=
SV_BRANCH=
SU_REPO=
SU_BRANCH=
LIBHTP_REPO=
LIBHTP_BRANCH=

Issue: 6755

When NetmapOpen encounters an error opening the netmap device, it'll
retry a bit. When the retry limit is reached, it'll shutdown Suricata.

This commit ensures that the device list lock is not held when before
closing all open devices before terminating Suricata.
Copy link

codecov bot commented Feb 9, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (7e4dba7) 82.32% compared to head (bcd00f5) 82.32%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #10349      +/-   ##
==========================================
- Coverage   82.32%   82.32%   -0.01%     
==========================================
  Files         978      978              
  Lines      272147   272147              
==========================================
- Hits       224057   224051       -6     
- Misses      48090    48096       +6     
Flag Coverage Δ
fuzzcorpus 63.59% <ø> (-0.01%) ⬇️
suricata-verify 61.47% <ø> (-0.02%) ⬇️
unittests 62.83% <ø> (ø)

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

@victorjulien victorjulien added this to the 8.0 milestone Feb 9, 2024
@suricata-qa
Copy link

Information: QA ran without warnings.

Pipeline 18275

@victorjulien
Copy link
Member

Merged in #10359, thanks!

@jlucovsky jlucovsky deleted the 6755/2 branch February 25, 2024 15:10
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.

3 participants