Check added to PcapNg processing #4373
Merged
Conversation
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
gpotter2
reviewed
Apr 30, 2024
guedou
force-pushed
the
guedou/20240430/oss-fuzz
branch
from
309dc52 to
a86c368
Compare
guedou
force-pushed
the
guedou/20240430/oss-fuzz
branch
from
a86c368 to
1e5bca1
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #4373 +/- ##
=======================================
Coverage 82.20% 82.21%
=======================================
Files 353 353
Lines 83529 83607 +78
=======================================
+ Hits 68662 68734 +72
- Misses 14867 14873 +6
|
|
I apologize for bringing this up here but since it's related to OSS-Fuzz I wonder if it would be OK if I opened google/oss-fuzz#9629 again? |
|
@evverx I am fine with the proposed PR that loads all layers. However, I will prefer to keep the reports to the Scapy maintainers only. |
|
Fair enough. I fuzz scapy elsewhere so I don't need access to bug reports on OSS-Fuzz (though it would make it easier to filter out duplicates, comment on issues like #3145 (comment) reproducible by that fuzz target in certain environments only and so on). I'll open a PR without my email address then. |
|
The others maintainers might have a different opinion. |
|
I'm personally fine with @evverx having their email there. Two reasons:
|
|
One test case is small (~100 bytes), while the two others one are big (1k+ bytes). I could try to reduce the big ones if you think that it is worth the effort. |
|
Not necessarily, that was more a question than a change request to your PR! |
p-l-
previously approved these changes
May 2, 2024
|
@gpotter2 I managed to strip down the test cases to 12, 100 and 140 bytes. If that's OK for you, I will add the corresponding unit tests. |
FWIW It should be possible to turn on CIFuzz: https://google.github.io/oss-fuzz/getting-started/continuous-integration/. It downloads corpora accumulated by OSS-Fuzz (including test cases that triggered issues in the past) and runs fuzz targets with them. It doesn't catch all the issues but it should be enough to catch most regressions when PRs are opened. Though it looks like OSS-Fuzz is updating the toolchains, interpreters and some other things so I'd wait for them to finish just in case to avoid running into things like google/oss-fuzz#11886. |
evverx
added a commit
to evverx/scapy
that referenced
this pull request
May 3, 2024
using https://google.github.io/oss-fuzz/getting-started/continuous-integration/ It downloads the corpus OSS-Fuzz has accumulated so far (including the test cases that triggered issues in the past) and runs the fuzz target with it. It should help to catch most regressions when PRs are opened. Prompted by secdev#4373.
evverx
added a commit
to evverx/oss-fuzz
that referenced
this pull request
May 6, 2024
It was discussed in secdev/scapy#4373 (comment)
|
(I opened google/oss-fuzz#11912. It should hopefully make the regression test from #4378 a bit more useful) |
jonathanmetzman
pushed a commit
to google/oss-fuzz
that referenced
this pull request
May 7, 2024
When scapy reads pcap/pcapng files it extracts link layer types from headers and tries to match them with classes representing those layers. Those classes are registered in conf.l2types.num2layer when they are imported so if no layers are imported the only known layer is Raw and it isn't very interesting in terms of fuzzing because it just wraps bytes without parsing anything. Apart from populating l2types when the layers are imported they are bound to make it possible for scapy to guess payloads and move from lower layers all the way up. The coverage went from 24% to 39%. It can be bumped further but I think it would be better to roll out those changes gradually. * [scapy] fix indentation Fixes: ```sh projects/scapy/pcap_fuzzer.py:21:3: E111 indentation is not a multiple of 4 projects/scapy/pcap_fuzzer.py:36:3: E111 indentation is not a multiple of 4 projects/scapy/pcap_fuzzer.py:37:3: E111 indentation is not a multiple of 4 projects/scapy/pcap_fuzzer.py:41:3: E111 indentation is not a multiple of 4 ... ``` and makes it easier to change the code using editors expecting Python code to be compliant with PEP 8. [scapy] update the CC list It was discussed in secdev/scapy#4373 (comment)
p-l-
approved these changes
May 7, 2024
evverx
added a commit
to evverx/scapy
that referenced
this pull request
May 7, 2024
using https://google.github.io/oss-fuzz/getting-started/continuous-integration/ It downloads the corpus OSS-Fuzz has accumulated so far (including the test cases that triggered issues in the past) and runs the fuzz target with it. It should help to catch most regressions when PRs are opened. Prompted by secdev#4373.
evverx
added a commit
to evverx/scapy
that referenced
this pull request
May 15, 2024
using https://google.github.io/oss-fuzz/getting-started/continuous-integration/ It downloads the corpus OSS-Fuzz has accumulated so far (including the test cases that triggered issues in the past) and runs the fuzz target with it. It should help to catch most regressions when PRs are opened. Prompted by secdev#4373.
evverx
added a commit
to evverx/scapy
that referenced
this pull request
May 15, 2024
using https://google.github.io/oss-fuzz/getting-started/continuous-integration/ It downloads the corpus OSS-Fuzz has accumulated so far (including the test cases that triggered issues in the past) and runs the fuzz target with it. It should help to catch most regressions when PRs are opened. Prompted by secdev#4373.
evverx
added a commit
to evverx/scapy
that referenced
this pull request
May 22, 2024
using https://google.github.io/oss-fuzz/getting-started/continuous-integration/ It downloads the corpus OSS-Fuzz has accumulated so far (including the test cases that triggered issues in the past) and runs the fuzz target with it. It should help to catch most regressions when PRs are opened. Prompted by secdev#4373.
evverx
added a commit
to evverx/scapy
that referenced
this pull request
May 23, 2024
using https://google.github.io/oss-fuzz/getting-started/continuous-integration/ It downloads the corpus OSS-Fuzz has accumulated so far (including the test cases that triggered issues in the past) and runs the fuzz target with it. It should help to catch most regressions when PRs are opened. Prompted by secdev#4373.
evverx
added a commit
to evverx/scapy
that referenced
this pull request
Jun 1, 2024
using https://google.github.io/oss-fuzz/getting-started/continuous-integration/ It downloads the corpus OSS-Fuzz has accumulated so far (including the test cases that triggered issues in the past) and runs the fuzz target with it. It should help to catch most regressions when PRs are opened. Prompted by secdev#4373.
evverx
added a commit
to evverx/scapy
that referenced
this pull request
Jun 10, 2024
using https://google.github.io/oss-fuzz/getting-started/continuous-integration/ It downloads the corpus OSS-Fuzz has accumulated so far (including the test cases that triggered issues in the past) and runs the fuzz target with it. It should help to catch most regressions when PRs are opened. Prompted by secdev#4373.
evverx
added a commit
to evverx/scapy
that referenced
this pull request
Jun 15, 2024
using https://google.github.io/oss-fuzz/getting-started/continuous-integration/ It downloads the corpus OSS-Fuzz has accumulated so far (including the test cases that triggered issues in the past) and runs the fuzz target with it. It should help to catch most regressions when PRs are opened. Prompted by secdev#4373.
evverx
added a commit
to evverx/scapy
that referenced
this pull request
Jun 21, 2024
using https://google.github.io/oss-fuzz/getting-started/continuous-integration/ It downloads the corpus OSS-Fuzz has accumulated so far (including the test cases that triggered issues in the past) and runs the fuzz target with it. It should help to catch most regressions when PRs are opened. Prompted by secdev#4373.
evverx
added a commit
to evverx/scapy
that referenced
this pull request
Jun 22, 2024
using https://google.github.io/oss-fuzz/getting-started/continuous-integration/ It downloads the corpus OSS-Fuzz has accumulated so far (including the test cases that triggered issues in the past) and runs the fuzz target with it. It should help to catch most regressions when PRs are opened. Prompted by secdev#4373.
evverx
added a commit
to evverx/scapy
that referenced
this pull request
Jun 28, 2024
using https://google.github.io/oss-fuzz/getting-started/continuous-integration/ It downloads the corpus OSS-Fuzz has accumulated so far (including the test cases that triggered issues in the past) and runs the fuzz target with it. It should help to catch most regressions when PRs are opened. Prompted by secdev#4373.
evverx
added a commit
to evverx/scapy
that referenced
this pull request
Jun 30, 2024
using https://google.github.io/oss-fuzz/getting-started/continuous-integration/ It downloads the corpus OSS-Fuzz has accumulated so far (including the test cases that triggered issues in the past) and runs the fuzz target with it. It should help to catch most regressions when PRs are opened. Prompted by secdev#4373.
evverx
added a commit
to evverx/scapy
that referenced
this pull request
Jul 1, 2024
using https://google.github.io/oss-fuzz/getting-started/continuous-integration/ It downloads the corpus OSS-Fuzz has accumulated so far (including the test cases that triggered issues in the past) and runs the fuzz target with it. It should help to catch most regressions when PRs are opened. Prompted by secdev#4373.
gpotter2
pushed a commit
that referenced
this pull request
Jul 1, 2024
* ci: run the fuzz target on PRs using https://google.github.io/oss-fuzz/getting-started/continuous-integration/ It downloads the corpus OSS-Fuzz has accumulated so far (including the test cases that triggered issues in the past) and runs the fuzz target with it. It should help to catch most regressions when PRs are opened. Prompted by #4373. * dcerpc: turn print into log_runtime.warning to make it possible to turn it off with logging.disable(). (it should help to make the fuzz target less chatty among other things because it seems to be the only dissector (covered by the fuzz target) printing messages like that directly)
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.
This PR fixes issues discovered by oss-fuzz.