Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9a058fe authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "limit extra fds in random parcel" am: 6e5dda51 am: 83eb9295 am: b031f905 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2321992



Change-Id: I21ed3188dc825a8e36795e58052d5e5645d7c72b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b4d42f97 b031f905

libs/binder/tests/parcel_fuzzer/random_parcel.cpp

+5 −0
Original line number Diff line number Diff line
@@ -73,6 +73,11 @@ void fillRandomParcel(Parcel* p, FuzzedDataProvider&& provider, RandomParcelOpti 
                                                                                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(),