Merge "Secretkeeper HAL: support large messages" into main (b077fcce) · Commits · e / os / android_system_core

trusty/secretkeeper/Android.bp

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -28,12 +28,13 @@ rust_binary {
	],		],
	rustlibs: [		rustlibs: [
	"libandroid_logger",		"libandroid_logger",
	"libbinder_rs",
	"libauthgraph_hal",		"libauthgraph_hal",
	"libtrusty-rs",		"libauthgraph_wire",
			"libbinder_rs",
	"liblibc",		"liblibc",
	"liblog_rust",		"liblog_rust",
	"libsecretkeeper_hal",		"libsecretkeeper_hal",
			"libtrusty-rs",
	],		],
	defaults: [		defaults: [
	"secretkeeper_use_latest_hal_aidl_rust",		"secretkeeper_use_latest_hal_aidl_rust",

trusty/secretkeeper/src/hal_main.rs

+37 −29

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,8 @@
	// limitations under the License.		// limitations under the License.

	//! This module implements the HAL service for Secretkeeper in Trusty.		//! This module implements the HAL service for Secretkeeper in Trusty.
	use authgraph_hal::{channel::SerializedChannel};		use authgraph_hal::channel::SerializedChannel;
			use authgraph_wire::fragmentation::{Fragmenter, Reassembler};
	use secretkeeper_hal::SecretkeeperService;		use secretkeeper_hal::SecretkeeperService;
	use android_hardware_security_secretkeeper::aidl::android::hardware::security::secretkeeper::ISecretkeeper::{		use android_hardware_security_secretkeeper::aidl::android::hardware::security::secretkeeper::ISecretkeeper::{
	ISecretkeeper, BpSecretkeeper,		ISecretkeeper, BpSecretkeeper,
	@@ -22,6 +23,7 @@ use android_hardware_security_secretkeeper::aidl::android::hardware::security::s
	use log::{error, info};		use log::{error, info};
	use std::{		use std::{
	ffi::CString,		ffi::CString,
			fmt::Debug,
	panic,		panic,
	sync::{Arc, Mutex},		sync::{Arc, Mutex},
	};		};
	@@ -29,6 +31,7 @@ use trusty::DEFAULT_DEVICE;

	const SK_TIPC_SERVICE_PORT: &str = "com.android.trusty.secretkeeper";		const SK_TIPC_SERVICE_PORT: &str = "com.android.trusty.secretkeeper";
	const AG_TIPC_SERVICE_PORT: &str = "com.android.trusty.secretkeeper.authgraph";		const AG_TIPC_SERVICE_PORT: &str = "com.android.trusty.secretkeeper.authgraph";
			const TIPC_MAX_SIZE: usize = 4000;

	static SERVICE_INSTANCE: &str = "default";		static SERVICE_INSTANCE: &str = "default";

	@@ -47,38 +50,43 @@ impl TipcChannel {
	}		}
	}		}

			fn binderr<E: Debug>(msg: &str, e: E) -> binder::Status {
			binder::Status::new_exception(
			binder::ExceptionCode::TRANSACTION_FAILED,
			Some(&CString::new(format!("Failed to {msg} via tipc channel: {e:?}",)).unwrap()),
			)
			}

	impl SerializedChannel for TipcChannel {		impl SerializedChannel for TipcChannel {
	const MAX_SIZE: usize = 4000;		// No maximum size for messages passed to `execute()` because it performs fragmentation
			// and reassembly internally.
			const MAX_SIZE: usize = usize::MAX;

	fn execute(&self, req_data: &[u8]) -> binder::Result<Vec<u8>> {		fn execute(&self, req_data: &[u8]) -> binder::Result<Vec<u8>> {
	// Hold lock across both request and response.		// Hold lock across both request and response.
	let mut channel = self.channel.lock().unwrap();		let mut channel = self.channel.lock().unwrap();
	channel.send(req_data).map_err(\|e\| {		let mut pending_rsp = Reassembler::default();
	binder::Status::new_exception(
	binder::ExceptionCode::TRANSACTION_FAILED,		// Break request message into fragments to send.
	Some(		for req_frag in Fragmenter::new(req_data, TIPC_MAX_SIZE) {
	&CString::new(format!(		channel.send(&req_frag).map_err(\|e\| binderr("send request", e))?;
	"Failed to send the request via tipc channel because of {:?}",
	e		// Every request gets a response.
	))		let mut rsp_frag = Vec::new();
	.unwrap(),		channel.recv(&mut rsp_frag).map_err(\|e\| binderr("receive response", e))?;
	),
	)		if let Some(full_rsp) = pending_rsp.accumulate(&rsp_frag) {
	})?;		return Ok(full_rsp.to_vec());
	// TODO: cope with fragmentation and reassembly		}
	let mut rsp_data = Vec::new();		}
	channel.recv(&mut rsp_data).map_err(\|e\| {		// There may be additional response fragments to receive.
	binder::Status::new_exception(		loop {
	binder::ExceptionCode::TRANSACTION_FAILED,		let mut rsp_frag = Vec::new();
	Some(		channel.recv(&mut rsp_frag).map_err(\|e\| binderr("receive response", e))?;
	&CString::new(format!(		if let Some(full_rsp) = pending_rsp.accumulate(&rsp_frag) {
	"Failed to receive the response via tipc channel because of {:?}",		return Ok(full_rsp.to_vec());
	e		}
	))		}
	.unwrap(),
	),
	)
	})?;
	Ok(rsp_data)
	}		}
	}		}