Loading media/mtp/tests/MtpFuzzer/Android.bp +6 −0 Original line number Diff line number Diff line Loading @@ -125,3 +125,9 @@ cc_fuzz { "-DMTP_DEVICE", ], } cc_fuzz { name: "mtp_request_packet_fuzzer", srcs: ["mtp_request_packet_fuzzer.cpp"], defaults: ["mtp_packet_defaults"], } media/mtp/tests/MtpFuzzer/README.md +21 −0 Original line number Diff line number Diff line Loading @@ -7,6 +7,7 @@ + [mtp_handle_fuzzer](#MtpHandle) + [mtp_packet_fuzzer](#MtpPacket) + [mtp_device_fuzzer](#MtpDevice) + [mtp_request_packet_fuzzer](#MtpRequestPacket) # <a name="MtpServer"></a> Fuzzer for MtpServer Loading Loading @@ -122,3 +123,23 @@ MtpDevice supports the following parameters: $ adb sync data $ adb shell /data/fuzz/arm64/mtp_device_fuzzer/mtp_device_fuzzer ``` # <a name="MtpRequestPacket"></a> Fuzzer for MtpRequestPacket MtpRequestPacket supports the following parameters: 1. Data (parameter name: "data") | Parameter| Valid Values |Configured Value| |-------------|----------|----- | |`data`| Vector of positive Integer |Value obtained from FuzzedDataProvider| #### Steps to run 1. Build the fuzzer ``` $ mm -j$(nproc) mtp_request_packet_fuzzer ``` 2. Run on device ``` $ adb sync data $ adb shell /data/fuzz/arm64/mtp_request_packet_fuzzer/mtp_request_packet_fuzzer ``` media/mtp/tests/MtpFuzzer/mtp_request_packet_fuzzer.cpp 0 → 100644 +87 −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 <MtpDevHandle.h> #include <MtpPacketFuzzerUtils.h> #include <MtpRequestPacket.h> #include <fuzzer/FuzzedDataProvider.h> #include <fstream> using namespace android; std::string kMtpDevPath = "/dev/mtp_usb"; constexpr int32_t kMaxBytes = 100000; class MtpRequestPacketFuzzer : MtpPacketFuzzerUtils { public: MtpRequestPacketFuzzer(const uint8_t* data, size_t size) : mFdp(data, size) { mUsbDevFsUrb = (struct usbdevfs_urb*)malloc(sizeof(struct usbdevfs_urb) + sizeof(struct usbdevfs_iso_packet_desc)); }; ~MtpRequestPacketFuzzer() { free(mUsbDevFsUrb); }; void process(); private: FuzzedDataProvider mFdp; void makeFile(std::string s); }; void MtpRequestPacketFuzzer::process() { MtpRequestPacket mtpRequestPacket; while (mFdp.remaining_bytes() > 0) { auto mtpRequestAPI = mFdp.PickValueInArray<const std::function<void()>>({ [&]() { mtpRequestPacket.allocate(mFdp.ConsumeIntegralInRange(kMinSize, kMaxSize)); }, [&]() { mtpRequestPacket.reset(); }, [&]() { MtpDevHandle handle; makeFile(kMtpDevPath); handle.start(mFdp.ConsumeBool()); std::vector<uint8_t> data = mFdp.ConsumeBytes<uint8_t>( mFdp.ConsumeIntegralInRange<size_t>(kMinSize, kMaxSize)); handle.write(data.data(), data.size()); mtpRequestPacket.read(&handle); handle.close(); remove(kMtpDevPath.c_str()); }, [&]() { fillFilePath(&mFdp); int32_t fd = memfd_create(mPath.c_str(), MFD_ALLOW_SEALING); fillUsbRequest(fd, &mFdp); mUsbRequest.dev = usb_device_new(mPath.c_str(), fd); mtpRequestPacket.write(&mUsbRequest); usb_device_close(mUsbRequest.dev); }, }); mtpRequestAPI(); } } void MtpRequestPacketFuzzer::makeFile(std::string s) { std::ofstream out; out.open(s, std::ios::binary | std::ofstream::trunc); for (int32_t idx = 0; idx < mFdp.ConsumeIntegralInRange<int32_t>(kMinSize, kMaxSize); ++idx) { out << mFdp.ConsumeRandomLengthString(kMaxBytes) << "\n"; } out.close(); } extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { MtpRequestPacketFuzzer mtpRequestPacketFuzzer(data, size); mtpRequestPacketFuzzer.process(); return 0; } Loading
media/mtp/tests/MtpFuzzer/Android.bp +6 −0 Original line number Diff line number Diff line Loading @@ -125,3 +125,9 @@ cc_fuzz { "-DMTP_DEVICE", ], } cc_fuzz { name: "mtp_request_packet_fuzzer", srcs: ["mtp_request_packet_fuzzer.cpp"], defaults: ["mtp_packet_defaults"], }
media/mtp/tests/MtpFuzzer/README.md +21 −0 Original line number Diff line number Diff line Loading @@ -7,6 +7,7 @@ + [mtp_handle_fuzzer](#MtpHandle) + [mtp_packet_fuzzer](#MtpPacket) + [mtp_device_fuzzer](#MtpDevice) + [mtp_request_packet_fuzzer](#MtpRequestPacket) # <a name="MtpServer"></a> Fuzzer for MtpServer Loading Loading @@ -122,3 +123,23 @@ MtpDevice supports the following parameters: $ adb sync data $ adb shell /data/fuzz/arm64/mtp_device_fuzzer/mtp_device_fuzzer ``` # <a name="MtpRequestPacket"></a> Fuzzer for MtpRequestPacket MtpRequestPacket supports the following parameters: 1. Data (parameter name: "data") | Parameter| Valid Values |Configured Value| |-------------|----------|----- | |`data`| Vector of positive Integer |Value obtained from FuzzedDataProvider| #### Steps to run 1. Build the fuzzer ``` $ mm -j$(nproc) mtp_request_packet_fuzzer ``` 2. Run on device ``` $ adb sync data $ adb shell /data/fuzz/arm64/mtp_request_packet_fuzzer/mtp_request_packet_fuzzer ```
media/mtp/tests/MtpFuzzer/mtp_request_packet_fuzzer.cpp 0 → 100644 +87 −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 <MtpDevHandle.h> #include <MtpPacketFuzzerUtils.h> #include <MtpRequestPacket.h> #include <fuzzer/FuzzedDataProvider.h> #include <fstream> using namespace android; std::string kMtpDevPath = "/dev/mtp_usb"; constexpr int32_t kMaxBytes = 100000; class MtpRequestPacketFuzzer : MtpPacketFuzzerUtils { public: MtpRequestPacketFuzzer(const uint8_t* data, size_t size) : mFdp(data, size) { mUsbDevFsUrb = (struct usbdevfs_urb*)malloc(sizeof(struct usbdevfs_urb) + sizeof(struct usbdevfs_iso_packet_desc)); }; ~MtpRequestPacketFuzzer() { free(mUsbDevFsUrb); }; void process(); private: FuzzedDataProvider mFdp; void makeFile(std::string s); }; void MtpRequestPacketFuzzer::process() { MtpRequestPacket mtpRequestPacket; while (mFdp.remaining_bytes() > 0) { auto mtpRequestAPI = mFdp.PickValueInArray<const std::function<void()>>({ [&]() { mtpRequestPacket.allocate(mFdp.ConsumeIntegralInRange(kMinSize, kMaxSize)); }, [&]() { mtpRequestPacket.reset(); }, [&]() { MtpDevHandle handle; makeFile(kMtpDevPath); handle.start(mFdp.ConsumeBool()); std::vector<uint8_t> data = mFdp.ConsumeBytes<uint8_t>( mFdp.ConsumeIntegralInRange<size_t>(kMinSize, kMaxSize)); handle.write(data.data(), data.size()); mtpRequestPacket.read(&handle); handle.close(); remove(kMtpDevPath.c_str()); }, [&]() { fillFilePath(&mFdp); int32_t fd = memfd_create(mPath.c_str(), MFD_ALLOW_SEALING); fillUsbRequest(fd, &mFdp); mUsbRequest.dev = usb_device_new(mPath.c_str(), fd); mtpRequestPacket.write(&mUsbRequest); usb_device_close(mUsbRequest.dev); }, }); mtpRequestAPI(); } } void MtpRequestPacketFuzzer::makeFile(std::string s) { std::ofstream out; out.open(s, std::ios::binary | std::ofstream::trunc); for (int32_t idx = 0; idx < mFdp.ConsumeIntegralInRange<int32_t>(kMinSize, kMaxSize); ++idx) { out << mFdp.ConsumeRandomLengthString(kMaxBytes) << "\n"; } out.close(); } extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { MtpRequestPacketFuzzer mtpRequestPacketFuzzer(data, size); mtpRequestPacketFuzzer.process(); return 0; }