@@ -280,11 +280,15 @@ fn prepare_vm_state_dir(state_dir: &Path, expected_uid: u32) -> Result<()> {
280280 } ) ?;
281281 let metadata = checked_directory_metadata ( state_dir, expected_uid, "vm driver state dir" ) ?;
282282 let mode = metadata. permissions ( ) . mode ( ) & 0o777 ;
283- if mode & 0o022 != 0 {
284- return Err ( Error :: execution ( format ! (
285- "vm driver state dir '{}' must not be group/world-writable (mode {mode:03o})" ,
286- state_dir. display( )
287- ) ) ) ;
283+ if mode != 0o700 {
284+ std:: fs:: set_permissions ( state_dir, std:: fs:: Permissions :: from_mode ( 0o700 ) ) . map_err (
285+ |err| {
286+ Error :: execution ( format ! (
287+ "failed to restrict vm driver state dir '{}': {err}" ,
288+ state_dir. display( )
289+ ) )
290+ } ,
291+ ) ?;
288292 }
289293 Ok ( ( ) )
290294}
@@ -720,7 +724,7 @@ mod tests {
720724 }
721725
722726 #[ test]
723- fn prepare_compute_driver_socket_path_rejects_writable_state_dir ( ) {
727+ fn prepare_compute_driver_socket_path_restricts_existing_state_dir ( ) {
724728 let dir = tempdir ( ) . unwrap ( ) ;
725729 let vm_config = VmComputeConfig {
726730 state_dir : dir. path ( ) . join ( "state" ) ,
@@ -731,10 +735,14 @@ mod tests {
731735 . unwrap ( ) ;
732736 let socket_path = compute_driver_socket_path ( & vm_config) ;
733737
734- let err = prepare_compute_driver_socket_path ( & vm_config, & socket_path)
735- . expect_err ( "world-writable state dir should be rejected" )
736- . to_string ( ) ;
737- assert ! ( err. contains( "must not be group/world-writable" ) ) ;
738+ prepare_compute_driver_socket_path ( & vm_config, & socket_path) . unwrap ( ) ;
739+
740+ let mode = std:: fs:: metadata ( vm_config. state_dir )
741+ . unwrap ( )
742+ . permissions ( )
743+ . mode ( )
744+ & 0o777 ;
745+ assert_eq ! ( mode, 0o700 ) ;
738746 }
739747
740748 #[ test]
0 commit comments