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

fuzz: improve header/data stop/continue modeling in HCM fuzzer. #10931

Merged
merged 4 commits into from
Apr 27, 2020

Conversation

htuch
Copy link
Member

@htuch htuch commented Apr 24, 2020

Previously we weren't tracking the status returned from the mock
decodeData(), leading to incorrect invocation of continueDecoding().
This resulted in the underlying fuzz bug that this patch fixes.

In addition to improve status state tracking, this PR also adds to the
mock codec's ability to return stop/continue from decodeHeaders() and
the full range of stop/continue values for decodeData().

Risk level: Low
Testing: Corpus entry added.

Fixes oss-fuzz issue
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=18378.

Signed-off-by: Harvey Tuch htuch@google.com

Previously we weren't tracking the status returned from the mock
decodeData(), leading to incorrect invocation of continueDecoding().
This resulted in the underlying fuzz bug that this patch fixes.

In addition to improve status state tracking, this PR also adds to the
mock codec's ability to return stop/continue from decodeHeaders() and
the full range of stop/continue values for decodeData().

Risk level: Low
Testing: Corpus entry added.

Fixes oss-fuzz issue
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=18378.

Signed-off-by: Harvey Tuch <htuch@google.com>
@htuch
Copy link
Member Author

htuch commented Apr 24, 2020

Need #10929 to land first to avoid tripping over that issue in the added corpus entry.

@htuch htuch requested a review from asraa April 24, 2020 13:56
Copy link
Contributor

@asraa asraa left a comment

Choose a reason for hiding this comment

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

thank you!

test/common/http/conn_manager_impl_fuzz_test.cc Outdated Show resolved Hide resolved
@htuch
Copy link
Member Author

htuch commented Apr 27, 2020

Should pass CI now that #10929 has merged.

@htuch htuch merged commit bad35c8 into envoyproxy:master Apr 27, 2020
@htuch htuch deleted the can-iterate-fuzz-fix branch April 27, 2020 15:45
spenceral added a commit to spenceral/envoy that referenced this pull request Apr 27, 2020
Signed-off-by: Spencer Lewis <slewis@squareup.com>

* master:
  fault injection: add support for setting gRPC status (envoyproxy#10841)
  tests: tag tests that fail on Windows with fails_on_windows (envoyproxy#10940)
  Fix typo on Postgres Proxy documentation. (envoyproxy#10930)
  fuzz: improve header/data stop/continue modeling in HCM fuzzer. (envoyproxy#10931)
  gzip filter: allow setting zlib compressor's chunk size (envoyproxy#10508)
  http: replace vector/reserve with InlinedVector in codec helper (envoyproxy#10941)
  stats: add utilities to create stats from a vector of tokens, mixing dynamic and symbolic elements. (envoyproxy#10735)
  hcm: avoid invoking 100-continue handling on decode filter. (envoyproxy#10929)
  prometheus stats: Correctly group lines of the same metric name. (envoyproxy#10833)
  status: Fix ASAN error in Status payload handling (envoyproxy#10906)
  path: Fix merge slash for paths ending with slash and present query args (envoyproxy#10922)
  compressor filter: add benchmark (envoyproxy#10464)
  xray: expected_span_name is not captured by the lambda with MSVC (envoyproxy#10934)
  ci: update before purge in cleanup (envoyproxy#10938)
  tracer: Improve test coverage for x-ray (envoyproxy#10890)
  Revert "init: order dynamic resource initialization to make RTDS always be first (envoyproxy#10362)" (envoyproxy#10919)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants