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

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

Merge "libbinder_random_parcel: driver" am: c572d08c am: 1fa80dfa

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

Change-Id: Ie70135f57c75f58efffdde6d08b56f2be4a101cd
parents 191dd2d2 1fa80dfa
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -66,10 +66,13 @@ cc_library_static {
    srcs: [
        "random_fd.cpp",
        "random_parcel.cpp",
        "libbinder_driver.cpp",
        "libbinder_ndk_driver.cpp",
    ],
    shared_libs: [
        "libbase",
        "libbinder",
        "libbinder_ndk",
        "libcutils",
        "libutils",
    ],
+37 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2022 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

#pragma once

#include <binder/IBinder.h>
#include <fuzzer/FuzzedDataProvider.h>

namespace android {
/**
 * Based on the random data in provider, construct an arbitrary number of
 * Parcel objects and send them to the service in serial.
 *
 * Usage:
 *
 *   extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
 *       FuzzedDataProvider provider = FuzzedDataProvider(data, size);
 *       // can use provider here to create a service with different options
 *       sp<IFoo> myService = sp<IFoo>::make(...);
 *       fuzzService(myService, std::move(provider));
 *   }
 */
void fuzzService(const sp<IBinder>& binder, FuzzedDataProvider&& provider);
} // namespace android
+37 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2022 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

#pragma once

#include <android/binder_parcel.h>
#include <fuzzer/FuzzedDataProvider.h>

namespace android {
/**
 * Based on the random data in provider, construct an arbitrary number of
 * Parcel objects and send them to the service in serial.
 *
 * Usage:
 *
 *   extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
 *       FuzzedDataProvider provider = FuzzedDataProvider(data, size);
 *       // can use provider here to create a service with different options
 *       std::shared_ptr<IFoo> myService = ndk::SharedRefBase<IFoo>::make(...);
 *       fuzzService(myService->asBinder().get(), std::move(provider));
 *   }
 */
void fuzzService(AIBinder* binder, FuzzedDataProvider&& provider);
} // namespace android
+37 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2022 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
#include <fuzzbinder/libbinder_driver.h>

#include <fuzzbinder/random_parcel.h>

namespace android {

void fuzzService(const sp<IBinder>& binder, FuzzedDataProvider&& provider) {
    while (provider.remaining_bytes() > 0) {
        uint32_t code = provider.ConsumeIntegral<uint32_t>();
        uint32_t flags = provider.ConsumeIntegral<uint32_t>();
        Parcel data;

        std::vector<uint8_t> subData = provider.ConsumeBytes<uint8_t>(
                provider.ConsumeIntegralInRange<size_t>(0, provider.remaining_bytes()));
        fillRandomParcel(&data, FuzzedDataProvider(subData.data(), subData.size()));

        Parcel reply;
        (void)binder->transact(code, data, &reply, flags);
    }
}

} // namespace android
+31 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2022 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
#include <fuzzbinder/libbinder_ndk_driver.h>

#include <fuzzbinder/libbinder_driver.h>
#include <fuzzbinder/random_parcel.h>

// libbinder_ndk doesn't export this header which breaks down its API for NDK
// and APEX users, but we need access to it to fuzz.
#include "../../ndk/ibinder_internal.h"

namespace android {

void fuzzService(AIBinder* binder, FuzzedDataProvider&& provider) {
    fuzzService(binder->getBinder(), std::move(provider));
}

} // namespace android