fuzz/Cargo.lock

@@ -720,9 +720,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.115"
+version = "1.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
+checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
 dependencies = [
  "itoa",
  "ryu",

virtio-devices/src/vhost_user/fs.rs

@@ -271,18 +271,17 @@ impl VhostUserFrontendReqHandler for BackendReqHandler {
     }
 }
 
-pub const VIRTIO_FS_TAG_LEN: usize = 36;
 #[derive(Copy, Clone, Versionize)]
 #[repr(C, packed)]
 pub struct VirtioFsConfig {
-    pub tag: [u8; VIRTIO_FS_TAG_LEN],
+    pub tag: [u8; 36],
     pub num_request_queues: u32,
 }
 
 impl Default for VirtioFsConfig {
     fn default() -> Self {
         VirtioFsConfig {
-            tag: [0; VIRTIO_FS_TAG_LEN],
+            tag: [0; 36],
             num_request_queues: 0,
         }
     }
@@ -398,13 +397,8 @@ impl Fs {
 
             // Create virtio-fs device configuration.
             let mut config = VirtioFsConfig::default();
-            let tag_bytes_slice = tag.as_bytes();
-            let len = if tag_bytes_slice.len() < config.tag.len() {
-                tag_bytes_slice.len()
-            } else {
-                config.tag.len()
-            };
-            config.tag[..len].copy_from_slice(tag_bytes_slice[..len].as_ref());
+            let tag_bytes_vec = tag.to_string().into_bytes();
+            config.tag[..tag_bytes_vec.len()].copy_from_slice(tag_bytes_vec.as_slice());
             config.num_request_queues = req_num_queues as u32;
 
             (

vmm/src/config.rs

@@ -24,8 +24,6 @@ const MAX_NUM_PCI_SEGMENTS: u16 = 96;
 pub enum Error {
     /// Filesystem tag is missing
     ParseFsTagMissing,
-    /// Filesystem tag is too long
-    ParseFsTagTooLong,
     /// Filesystem socket is missing
     ParseFsSockMissing,
     /// Missing persistent memory file parameter.
@@ -357,11 +355,6 @@ impl fmt::Display for Error {
             ParseFileSystem(o) => write!(f, "Error parsing --fs: {o}"),
             ParseFsSockMissing => write!(f, "Error parsing --fs: socket missing"),
             ParseFsTagMissing => write!(f, "Error parsing --fs: tag missing"),
-            ParseFsTagTooLong => write!(
-                f,
-                "Error parsing --fs: max tag length is {}",
-                virtio_devices::vhost_user::VIRTIO_FS_TAG_LEN
-            ),
             ParsePersistentMemory(o) => write!(f, "Error parsing --pmem: {o}"),
             ParsePmemFileMissing => write!(f, "Error parsing --pmem: file missing"),
             ParseVsock(o) => write!(f, "Error parsing --vsock: {o}"),
@@ -1526,9 +1519,6 @@ impl FsConfig {
         parser.parse(fs).map_err(Error::ParseFileSystem)?;
 
         let tag = parser.get("tag").ok_or(Error::ParseFsTagMissing)?;
-        if tag.len() > virtio_devices::vhost_user::VIRTIO_FS_TAG_LEN {
-            return Err(Error::ParseFsTagTooLong);
-        }
         let socket = PathBuf::from(parser.get("socket").ok_or(Error::ParseFsSockMissing)?);
 
         let queue_size = parser