Merge changes I94a1cc28,Ib3f40e7d am: ce519b8a97 (48c48867) · Commits · e / os / android_system_core

trusty/gatekeeper/fuzz/Android.bp

+6 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,12 @@ package {
		cc_fuzz {
		name: "trusty_gatekeeper_fuzzer",
		defaults: ["trusty_fuzzer_defaults"],
		srcs: ["fuzz.cpp"],
		srcs: [":trusty_tipc_fuzzer"],
		cflags: [
		"-DTRUSTY_APP_PORT=\"com.android.trusty.gatekeeper\"",
		"-DTRUSTY_APP_UUID=\"38ba0cdc-df0e-11e4-9869-233fb6ae4795\"",
		"-DTRUSTY_APP_FILENAME=\"gatekeeper.syms.elf\"",
		],

		// The initial corpus for this fuzzer was derived by dumping messages from
		// the `secure_env` emulator interface for cuttlefish while enrolling a new

trusty/gatekeeper/fuzz/fuzz.cpp

deleted100644 → 0

+0 −76

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 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 <stdlib.h>
		#include <trusty/coverage/coverage.h>
		#include <trusty/fuzz/counters.h>
		#include <trusty/fuzz/utils.h>
		#include <unistd.h>
		#include <iostream>

		using android::trusty::coverage::CoverageRecord;
		using android::trusty::fuzz::ExtraCounters;
		using android::trusty::fuzz::TrustyApp;

		#define TIPC_DEV "/dev/trusty-ipc-dev0"
		#define GATEKEEPER_PORT "com.android.trusty.gatekeeper"
		#define GATEKEEPER_MODULE_NAME "gatekeeper.syms.elf"

		/* Gatekeeper TA's UUID is 38ba0cdc-df0e-11e4-9869-233fb6ae4795 */
		static struct uuid gatekeeper_uuid = {
		0x38ba0cdc,
		0xdf0e,
		0x11e4,
		{0x98, 0x69, 0x23, 0x3f, 0xb6, 0xae, 0x47, 0x95},
		};

		static CoverageRecord record(TIPC_DEV, &gatekeeper_uuid, GATEKEEPER_MODULE_NAME);

		extern "C" int LLVMFuzzerInitialize(int* /* argc /, char** /* argv */) {
		auto ret = record.Open();
		if (!ret.ok()) {
		std::cerr << ret.error() << std::endl;
		exit(-1);
		}
		return 0;
		}

		extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
		static uint8_t buf[TIPC_MAX_MSG_SIZE];

		ExtraCounters counters(&record);
		counters.Reset();

		android::trusty::fuzz::TrustyApp ta(TIPC_DEV, GATEKEEPER_PORT);
		auto ret = ta.Connect();
		if (!ret.ok()) {
		android::trusty::fuzz::Abort();
		}

		/* Send message to test server */
		ret = ta.Write(data, size);
		if (!ret.ok()) {
		return -1;
		}

		/* Read message from test server */
		ret = ta.Read(&buf, sizeof(buf));
		if (!ret.ok()) {
		return -1;
		}

		return 0;
		}

trusty/keymaster/fuzz/Android.bp

+6 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,12 @@ package {
		cc_fuzz {
		name: "trusty_keymaster_fuzzer",
		defaults: ["trusty_fuzzer_defaults"],
		srcs: ["fuzz.cpp"],
		srcs: [":trusty_tipc_fuzzer"],
		cflags: [
		"-DTRUSTY_APP_PORT=\"com.android.trusty.keymaster\"",
		"-DTRUSTY_APP_UUID=\"5f902ace-5e5c-4cd8-ae54-87b88c22ddaf\"",
		"-DTRUSTY_APP_FILENAME=\"keymaster.syms.elf\"",
		],

		// The initial corpus for this fuzzer was derived by dumping messages from
		// the `secure_env` emulator interface for cuttlefish while running the

trusty/keymaster/fuzz/fuzz.cpp

deleted100644 → 0

+0 −76

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 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 <stdlib.h>
		#include <trusty/coverage/coverage.h>
		#include <trusty/fuzz/counters.h>
		#include <trusty/fuzz/utils.h>
		#include <unistd.h>
		#include <iostream>

		using android::trusty::coverage::CoverageRecord;
		using android::trusty::fuzz::ExtraCounters;
		using android::trusty::fuzz::TrustyApp;

		#define TIPC_DEV "/dev/trusty-ipc-dev0"
		#define KEYMASTER_PORT "com.android.trusty.keymaster"
		#define KEYMASTER_MODULE_FILENAME "keymaster.syms.elf"

		/* Keymaster TA's UUID is 5f902ace-5e5c-4cd8-ae54-87b88c22ddaf */
		static struct uuid keymaster_uuid = {
		0x5f902ace,
		0x5e5c,
		0x4cd8,
		{0xae, 0x54, 0x87, 0xb8, 0x8c, 0x22, 0xdd, 0xaf},
		};

		static CoverageRecord record(TIPC_DEV, &keymaster_uuid, KEYMASTER_MODULE_FILENAME);

		extern "C" int LLVMFuzzerInitialize(int* /* argc /, char** /* argv */) {
		auto ret = record.Open();
		if (!ret.ok()) {
		std::cerr << ret.error() << std::endl;
		exit(-1);
		}
		return 0;
		}

		extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
		static uint8_t buf[TIPC_MAX_MSG_SIZE];

		ExtraCounters counters(&record);
		counters.Reset();

		android::trusty::fuzz::TrustyApp ta(TIPC_DEV, KEYMASTER_PORT);
		auto ret = ta.Connect();
		if (!ret.ok()) {
		android::trusty::fuzz::Abort();
		}

		/* Send message to test server */
		ret = ta.Write(data, size);
		if (!ret.ok()) {
		return -1;
		}

		/* Read message from test server */
		ret = ta.Read(&buf, sizeof(buf));
		if (!ret.ok()) {
		return -1;
		}

		return 0;
		}