From 9da363e79b2825ef7fe34413cad17ec74e63c525 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 19 Jun 2023 10:17:02 +0000 Subject: [PATCH] vmm: ignore and warn TAP FDs send in vm.create This does the same thing as df2a7c17 ("vmm: Ignore and warn TAP FDs sent via the HTTP request body"), but for the vm.create endpoint, which also previously would accept file descriptors in the body, and try to use whatever fd occupied that number as a TAP device. Signed-off-by: Alyssa Ross --- vmm/src/api/http_endpoint.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/vmm/src/api/http_endpoint.rs b/vmm/src/api/http_endpoint.rs index 00f1584ba..727939dde 100644 --- a/vmm/src/api/http_endpoint.rs +++ b/vmm/src/api/http_endpoint.rs @@ -36,13 +36,22 @@ impl EndpointHandler for VmCreate { match &req.body { Some(body) => { // Deserialize into a VmConfig - let vm_config: VmConfig = match serde_json::from_slice(body.raw()) + let mut vm_config: VmConfig = match serde_json::from_slice(body.raw()) .map_err(HttpError::SerdeJsonDeserialize) { Ok(config) => config, Err(e) => return error_response(e, StatusCode::BadRequest), }; + if let Some(ref mut nets) = vm_config.net { + if nets.iter().any(|net| net.fds.is_some()) { + warn!("Ignoring FDs sent via the HTTP request body"); + } + for net in nets { + net.fds = None; + } + } + // Call vm_create() match vm_create(api_notifier, api_sender, Arc::new(Mutex::new(vm_config))) .map_err(HttpError::ApiError)