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

Commit ba36da6e authored by Pawan Wagh's avatar Pawan Wagh Committed by Automerger Merge Worker
Browse files

Merge "Limit number of fds written in parcel" into main am: e6428292 am: fc816eea 

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



Change-Id: Ieb621a616eddb6adc9917bbe64614e6face3a9c8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1937cffc fc816eea

libs/binder/tests/parcel_fuzzer/random_parcel.cpp

+10 −1
Original line number Diff line number Diff line
@@ -66,6 +66,11 @@ void fillRandomParcel(Parcel* p, FuzzedDataProvider&& provider, RandomParcelOpti 
                },

                // write FD

                [&]() {

                    // b/296516864 - Limit number of objects written to a parcel.

                    if (p->objectsCount() > 100) {

                        return;

                    }



                    if (options->extraFds.size() > 0 && provider.ConsumeBool()) {

                        const base::unique_fd& fd = options->extraFds.at(

                                provider.ConsumeIntegralInRange<size_t>(0,
@@ -82,7 +87,6 @@ void fillRandomParcel(Parcel* p, FuzzedDataProvider&& provider, RandomParcelOpti 
                        CHECK(OK ==

                              p->writeFileDescriptor(fds.begin()->release(),

                                                     true /*takeOwnership*/));



                        options->extraFds.insert(options->extraFds.end(),

                                                 std::make_move_iterator(fds.begin() + 1),

                                                 std::make_move_iterator(fds.end()));
@@ -90,6 +94,11 @@ void fillRandomParcel(Parcel* p, FuzzedDataProvider&& provider, RandomParcelOpti 
                },

                // write binder

                [&]() {

                    // b/296516864 - Limit number of objects written to a parcel.

                    if (p->objectsCount() > 100) {

                        return;

                    }



                    sp<IBinder> binder;

                    if (options->extraBinders.size() > 0 && provider.ConsumeBool()) {

                        binder = options->extraBinders.at(