| commit | a9a058feb8814df2e904c645a05b78b9feac628c | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Wed Dec 07 17:34:19 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 07 17:34:19 2022 +0000 |
| tree | 4613eef4b89c43258a7352e62a5f3c2c3dccc829 | |
| parent | b4d42f97ec1a518afa63bdd259dc9a2f201967e4 [diff] | |
| parent | b031f905d740457496b8f3155473e03f712d8c63 [diff] |
Merge "limit extra fds in random parcel" am: 6e5dda51cd am: 83eb929526 am: b031f905d7 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2321992 Change-Id: I21ed3188dc825a8e36795e58052d5e5645d7c72b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/tests/parcel_fuzzer/random_parcel.cpp b/libs/binder/tests/parcel_fuzzer/random_parcel.cpp index edc695f..f0beed2 100644 --- a/libs/binder/tests/parcel_fuzzer/random_parcel.cpp +++ b/libs/binder/tests/parcel_fuzzer/random_parcel.cpp
@@ -73,6 +73,11 @@ 1)); CHECK(OK == p->writeFileDescriptor(fd.get(), false /*takeOwnership*/)); } else { + // b/260119717 - Adding more FDs can eventually lead to FD limit exhaustion + if (options->extraFds.size() > 1000) { + return; + } + std::vector<base::unique_fd> fds = getRandomFds(&provider); CHECK(OK == p->writeFileDescriptor(fds.begin()->release(),