next/1406/80x/20260623/v1 - #15709
Merged
victorjulien merged 5 commits intoJun 23, 2026
Merged
Conversation
Ticket: 8634 (cherry picked from commit 097975e)
Reading a pcap from /dev/stdin or a named pipe currently fails with "failed to get first packet timestamp. pcap_next_ex(): -1" because InitPcapFile calls setvbuf on the FILE* underlying the pcap handle after libpcap has already consumed the pcap header. On a non-seekable fd glibc cannot recover from that and the next read returns -1. Detect non-regular files via fstat and skip setvbuf in that case so the read keeps working on pipes, fifos and stdin. Accept pcap-file.buffer-size values of 0, which disables setvbuf buffering as an explicit opt-out, or PCAP_FILE_BUFFER_SIZE_MIN (4 KiB) to PCAP_FILE_BUFFER_SIZE_MAX (64 MiB). Treat any non-zero setvbuf return value as an error, not just negative values. When pcap-file.buffer-size fails to parse, retain the default buffer size instead of falling through and setting it to 0. The branches are now mutually exclusive so only one of the parse-error, accepted, or out-of-range messages is logged. Update the user guide: --pcap-file-buffer-size now documents valid values of 0 (disables setvbuf buffering) or 4 KiB to 64 MiB, and pcap-file.rst notes that 0 is the opt-out for non-seekable sources such as stdin and named pipes. Bug: OISF#8464. (cherry picked from commit 565e138)
Ticket: 8624 (cherry picked from commit 3ca2ed2)
The ftpdata_command would never match a RETR in the to_server direction, or a STOR in the to_client direction, this effectively makes the ftpdata_command applicable to passive mode only. Instead, remove the directionality on the ftpdata_command. Its "meta" information passed from the control channel and isn't really directional. I think the idea was to abstract away active/passive from the rule writer, but unfortunately doesn't allow the ftpdata_command keyword to work in the more strict firewll mode. Ticket: OISF#8663 (cherry picked from commit 2fe4bb2)
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main-8.0.x #15709 +/- ##
==============================================
- Coverage 81.65% 81.64% -0.02%
==============================================
Files 1016 1016
Lines 276653 276685 +32
==============================================
- Hits 225890 225887 -3
- Misses 50763 50798 +35
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
|
Information: QA ran without warnings. Pipeline = 32227 |
catenacyber
approved these changes
Jun 23, 2026
catenacyber
left a comment
catenacyber
left a comment
Contributor
There was a problem hiding this comment.
Good staging
Good SV
Green CI + QA
This was referenced Jun 23, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Staging:
SV_BRANCH=OISF/suricata-verify#3185