Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# allowlisted using a toolchain that requires it, causing the A/B-test to
# always fail.
[toolchain]
channel = "1.96.0"
channel = "1.97.0"
targets = ["x86_64-unknown-linux-musl", "aarch64-unknown-linux-musl"]
profile = "minimal"

4 changes: 2 additions & 2 deletions src/jailer/src/cgroup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -392,13 +392,13 @@ impl CgroupV2 {
let parent = match path.as_ref().parent() {
Some(p) => p,
None => {
writeln_special(&cg_subtree_ctrl, format!("+{}", &controller))?;
writeln_special(&cg_subtree_ctrl, format!("+{}", controller))?;
return Ok(());
}
};

Self::write_all_subtree_control(parent, controller)?;
writeln_special(&cg_subtree_ctrl, format!("+{}", &controller))
writeln_special(&cg_subtree_ctrl, format!("+{}", controller))
}

// Returns controllers that can be enabled from the cgroup path specified
Expand Down
2 changes: 1 addition & 1 deletion src/jailer/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ mod tests {

let mut fds = Vec::new();
for i in 0..n {
let maybe_file = File::create(format!("{}/{}", &tmp_dir_path, i));
let maybe_file = File::create(format!("{}/{}", tmp_dir_path, i));
fds.push(maybe_file.unwrap().into_raw_fd());
}

Expand Down
2 changes: 1 addition & 1 deletion src/vmm/src/device_manager/mmio.rs
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ impl MMIODeviceManager {
#[cfg(target_arch = "aarch64")]
pub fn virtio_device_info(&self) -> Vec<&MMIODeviceInfo> {
let mut device_info = Vec::new();
for (_, dev) in self.virtio_devices.iter() {
for dev in self.virtio_devices.values() {
device_info.push(&dev.resources);
}
device_info
Expand Down
2 changes: 1 addition & 1 deletion tests/integration_tests/security/test_sec_audit.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ def set_of_vulnerabilities(output: utils.CommandReturn):
toml_file = FC_WORKSPACE_DIR / "Cargo.toml"

git_ab_test_host_command_if_pr(
f"cargo deny --manifest-path {toml_file} -f json check advisories",
f"RUSTUP_LOG=warn cargo deny --manifest-path {toml_file} -f json check advisories",
comparator=set_did_not_grow_comparator(set_of_vulnerabilities),
)
4 changes: 2 additions & 2 deletions tools/devctr/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ RUN apt-get update \
# Builder: static libseccomp (musl)
# ============================================================
FROM base-image AS libseccomp-builder
ENV LIBSECCOMP_VER="v2.6.0"
ENV LIBSECCOMP_VER="v2.6.1"

# Install static version of libseccomp
# We need to compile from source because
Expand Down Expand Up @@ -204,7 +204,7 @@ RUN cp /usr/lib/python3/dist-packages/seccomp.cpython-312-"$ARCH"-linux-gnu.so "
# Base: Rust toolchain (current version)
# ============================================================
FROM python-deps AS rust-toolchain
ARG RUST_TOOLCHAIN="1.96.0"
ARG RUST_TOOLCHAIN="1.97.0"
ENV CARGO_HOME=/usr/local/rust
ENV RUSTUP_HOME=/usr/local/rust
ENV PATH="$PATH:$CARGO_HOME/bin"
Expand Down
2 changes: 1 addition & 1 deletion tools/devtool
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
DEVCTR_IMAGE_NO_TAG="public.ecr.aws/firecracker/fcuvm"

# Development container tag
DEVCTR_IMAGE_TAG=${DEVCTR_IMAGE_TAG:-v91}
DEVCTR_IMAGE_TAG=${DEVCTR_IMAGE_TAG:-v92}

# Development container image (name:tag)
# This should be updated whenever we upgrade the development container.
Expand Down
Loading