fuzz: explicitly cap the vsize of RBFs for diagram checks #29879

pull instagibbs wants to merge 1 commits into bitcoin:master from instagibbs:2024-04-package-rbf-overflow changing 1 files +23 −4
  1. instagibbs commented at 2:40 pm on April 15, 2024: member

    In master we are hitting a case where vsize transactions much larger than max standard size are causing an overflow in not-yet-exposed RBF diagram checking code: #29757 (comment)

    ConsumeTxMemPoolEntry is creating entries with tens of thousands of sigops cost, causing the resulting RBFs to be “overly large”.

    To fix this I cause the fuzz test to stop adding transactions to the mempool when we reach a potential overflow of int32_t.

  2. DrahtBot commented at 2:40 pm on April 15, 2024: contributor

    The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

    Code Coverage

    For detailed information about the code coverage, see the test coverage report.

    Reviews

    See the guideline for information on the review process.

    Type Reviewers
    ACK glozow, marcofleon
    Stale ACK sipa

    If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

    Conflicts

    Reviewers, this pull request conflicts with the following ones:

    • #29757 (feefrac: avoid explicitly computing diagram; compare based on chunks by sipa)

    If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

  3. DrahtBot added the label Tests on Apr 15, 2024
  4. in src/test/fuzz/rbf.cpp:26 in b407d2111c outdated
    22@@ -23,7 +23,15 @@ namespace {
    23 const BasicTestingSetup* g_setup;
    24 } // namespace
    25 
    26+// Maximum number of things we will effect during an RBF
    


    instagibbs commented at 3:41 pm on April 15, 2024:
    this is hopefully a conservative over-estimate since clusters should only be 101kvB total each
  5. sipa commented at 4:00 pm on April 15, 2024: member

    I’m not convinced about this approach. A nice thing about fuzz test is that they can be written to exercise scenarios which go beyond what matters in practice, as more extreme values may trigger bugs more easily (and those bugs may affect realistic cases too, but be harder to trigger there).

    More specifically, in this case it seems the issue is the code under test not working if the sum of sizes exceeds 2^31. The standard transaction size shouldn’t matter for this code, so I’d prefer to restrict to supported cases more directly. E.g. by reading from the fuzzer only sizes in the range (1…2^31-1-sum_of_sizes_so_far) and/or stop adding transactions when the sum of sizes overflows.

    If that’s too hard to do, the current approach is fine of course, but even then, there is no strict need to tie it to standard sizes.

  6. instagibbs commented at 4:18 pm on April 15, 2024: member

    there is no strict need to tie it to standard sizes.

    Pretty sure we can overflow if we allow ~1MvB transactions(which is effectively being done via sigops), as 10,000 * 1,000,000 > 2^31

    Made a more direct limiting attempt. I will squash if it is preferred

  7. instagibbs force-pushed on Apr 15, 2024
  8. instagibbs force-pushed on Apr 15, 2024
  9. DrahtBot added the label CI failed on Apr 15, 2024
  10. DrahtBot commented at 5:30 pm on April 15, 2024: contributor

    🚧 At least one of the CI tasks failed. Make sure to run all tests locally, according to the documentation.

    Possibly this is due to a silent merge conflict (the changes in this pull request being incompatible with the current code in the target branch). If so, make sure to rebase on the latest commit of the target branch.

    Leave a comment here, if you need help tracking down a confusing failure.

    Debug: https://github.com/bitcoin/bitcoin/runs/23837896395

  11. in src/test/fuzz/rbf.cpp:133 in 914b6db6bb outdated
    127@@ -130,21 +128,21 @@ FUZZ_TARGET(package_rbf, .init = initialize_package_rbf)
    128 
    129         mempool_txs.emplace_back(*parent);
    130         const auto parent_entry = ConsumeTxMemPoolEntry(fuzzed_data_provider, mempool_txs.back());
    131-        // We don't want to test things we won't add to mempool (which may cause overflow in size)
    132-        if (parent_entry.GetTxSize() >= MAX_STANDARD_TX_SIZE) {
    133+        running_vsize_total += parent_entry.GetTxSize();
    134+        if (running_vsize_total > std::numeric_limits<int32_t>::max()) {
    135             return;
    


    sipa commented at 2:49 am on April 16, 2024:
    Is there a need to abort the fuzz test when this happens (here and below), or could this be a break to allow the test to proceed still, without the transaction that would make the total overflow?

    instagibbs commented at 11:31 am on April 16, 2024:
    done
  12. glozow commented at 8:23 am on April 16, 2024: member
    Approach of breaking when adding another tx would overflow seems fine to me. Did you forget to squash?
  13. instagibbs force-pushed on Apr 16, 2024
  14. instagibbs commented at 11:32 am on April 16, 2024: member
    @glozow was waiting for positive feedback. Squashed.
  15. DrahtBot removed the label CI failed on Apr 16, 2024
  16. sipa commented at 3:13 pm on April 16, 2024: member
    utACK 9d76d77ba04450e8b5b5a528b448b61c61346193
  17. fuzz: explicitly cap the vsize of RBFs for diagram checks 016ed248ba
  18. instagibbs force-pushed on Apr 16, 2024
  19. instagibbs commented at 3:29 pm on April 16, 2024: member
    pushed a fixup since I think it could have resulted in UB when selecting direct conflicts from the mempool_txs vector.
  20. glozow commented at 8:40 pm on April 17, 2024: member
    ACK 016ed248ba0ae64e3f0c93bb47a2cd9b5e49cd85
  21. DrahtBot requested review from sipa on Apr 17, 2024
  22. marcofleon commented at 11:47 pm on April 17, 2024: contributor

    I ran into this bug when I first started fuzzing package_rbf a couple weeks ago… was unsure of what to do about it at the time. But glad to see it addressed here.

    ACK 016ed248ba0ae64e3f0c93bb47a2cd9b5e49cd85. I ran libFuzzer on package_rbf on the current master branch until the overflow was encountered. Then I built the PR branch and ran the fuzzer using the crash input.

    0FUZZ=package_rbf ./src/test/fuzz/fuzz ../crash-d96abc99c0e424a47aa8f4080040e1bc3e3851f7
    

    No crash.

     0INFO: Running with entropic power schedule (0xFF, 100).
     1INFO: Seed: 1016851959
     2INFO: Loaded 1 modules   (1208798 inline 8-bit counters): 1208798 [0x107caa4c0, 0x107dd169e), 
     3INFO: Loaded 1 PC tables (1208798 PCs): 1208798 [0x107dd16a0,0x109043480), 
     4./src/test/fuzz/fuzz: Running 1 inputs 1 time(s) each.
     5Running: ../crash-d96abc99c0e424a47aa8f4080040e1bc3e3851f7
     6Executed ../crash-d96abc99c0e424a47aa8f4080040e1bc3e3851f7 in 1 ms
     7***
     8*** NOTE: fuzzing was not performed, you have only
     9***       executed the target code on a fixed set of inputs.
    10***
    

    I’ve also been running libFuzzer on package_rbf for a while now and the overflow bug hasn’t come up.

  23. glozow merged this on Apr 22, 2024
  24. glozow closed this on Apr 22, 2024


github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-06-29 07:13 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me