From a8408661e85de37ea32c7211618fe836f784eb49 Mon Sep 17 00:00:00 2001 From: Yashodhan Joshi Date: Fri, 21 Jan 2022 19:36:46 +0530 Subject: [PATCH] Add minimum rust version requirement to libcgroups and libcontainers due to CVE-2022-21658 --- .github/workflows/integration_tests_validation.yaml | 2 +- .github/workflows/main.yml | 7 ++++--- Cargo.lock | 10 +++++----- Cargo.toml | 2 ++ crates/libcgroups/Cargo.toml | 3 ++- crates/libcontainer/Cargo.toml | 7 ++++--- crates/liboci-cli/Cargo.toml | 2 +- crates/libseccomp/Cargo.toml | 2 +- crates/youki/Cargo.toml | 8 ++++---- 9 files changed, 24 insertions(+), 19 deletions(-) diff --git a/.github/workflows/integration_tests_validation.yaml b/.github/workflows/integration_tests_validation.yaml index 5ca69cfc..36d323ab 100644 --- a/.github/workflows/integration_tests_validation.yaml +++ b/.github/workflows/integration_tests_validation.yaml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - rust: [1.56.1, 1.58.0] + rust: [1.58.1] steps: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7eb9a944..45891df4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - rust: [1.56.1, 1.58.0] + rust: [1.58.1] dirs: ${{ fromJSON(needs.changes.outputs.dirs) }} steps: - uses: actions/checkout@v2 @@ -52,7 +52,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - rust: [1.56.1, 1.58.0] + rust: [1.58.1] steps: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 @@ -102,7 +102,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - rust: [1.56.1, 1.58.0] + rust: [1.58.1] steps: - uses: actions/checkout@v2 with: @@ -116,6 +116,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: toolchain: ${{ matrix.rust }} + override: true - name: Cache youki uses: Swatinem/rust-cache@v1 - run: sudo apt-get -y update diff --git a/Cargo.lock b/Cargo.lock index 3c2aa666..a9e0dece 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -718,7 +718,7 @@ checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" [[package]] name = "libcgroups" -version = "0.0.1" +version = "0.0.2" dependencies = [ "anyhow", "clap", @@ -740,7 +740,7 @@ dependencies = [ [[package]] name = "libcontainer" -version = "0.0.1" +version = "0.0.2" dependencies = [ "anyhow", "caps", @@ -788,14 +788,14 @@ dependencies = [ [[package]] name = "liboci-cli" -version = "0.0.1" +version = "0.0.2" dependencies = [ "clap", ] [[package]] name = "libseccomp" -version = "0.0.1" +version = "0.0.2" dependencies = [ "libc", "pkg-config", @@ -1661,7 +1661,7 @@ dependencies = [ [[package]] name = "youki" -version = "0.0.1" +version = "0.0.2" dependencies = [ "anyhow", "chrono", diff --git a/Cargo.toml b/Cargo.toml index 00c6f7d6..f8d2b646 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,5 @@ + + [workspace] members = [ "crates/*" diff --git a/crates/libcgroups/Cargo.toml b/crates/libcgroups/Cargo.toml index ccdb4959..a28813d9 100644 --- a/crates/libcgroups/Cargo.toml +++ b/crates/libcgroups/Cargo.toml @@ -1,7 +1,8 @@ [package] name = "libcgroups" -version = "0.0.1" +version = "0.0.2" edition = "2021" +rust-version = "1.58.1" autoexamples = false [features] diff --git a/crates/libcontainer/Cargo.toml b/crates/libcontainer/Cargo.toml index c896a84e..2aaab5ba 100644 --- a/crates/libcontainer/Cargo.toml +++ b/crates/libcontainer/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "libcontainer" -version = "0.0.1" +version = "0.0.2" authors = ["youki team"] edition = "2021" +rust-version = "1.58.1" description = "Library for container creation" [dependencies] @@ -22,8 +23,8 @@ oci-spec = "0.5.3" path-clean = "0.1.0" procfs = "0.12.0" prctl = "1.0.0" -libcgroups = { version = "0.0.1", path = "../libcgroups" } -libseccomp = { version = "0.0.1", path = "../libseccomp" } +libcgroups = { version = "0.0.2", path = "../libcgroups" } +libseccomp = { version = "0.0.2", path = "../libseccomp" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/crates/liboci-cli/Cargo.toml b/crates/liboci-cli/Cargo.toml index b8459916..e240ea3e 100644 --- a/crates/liboci-cli/Cargo.toml +++ b/crates/liboci-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "liboci-cli" -version = "0.0.1" +version = "0.0.2" authors = ["youki team"] edition = "2021" description = "Parse command line arguments for OCI container runtimes" diff --git a/crates/libseccomp/Cargo.toml b/crates/libseccomp/Cargo.toml index 20176c54..6a7de49c 100644 --- a/crates/libseccomp/Cargo.toml +++ b/crates/libseccomp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libseccomp" -version = "0.0.1" +version = "0.0.2" edition = "2021" build = "build.rs" diff --git a/crates/youki/Cargo.toml b/crates/youki/Cargo.toml index 4c40242c..c2082f95 100644 --- a/crates/youki/Cargo.toml +++ b/crates/youki/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "youki" -version = "0.0.1" +version = "0.0.2" authors = ["youki team"] edition = "2021" description = "A container runtime written in Rust" @@ -15,9 +15,9 @@ features = ["std", "suggestions", "derive", "cargo"] [dependencies] anyhow = "1.0.52" chrono = { version="0.4", features = ["serde"] } -libcgroups = { version = "0.0.1", path = "../libcgroups" } -libcontainer = { version = "0.0.1", path = "../libcontainer" } -liboci-cli = { version = "0.0.1", path = "../liboci-cli" } +libcgroups = { version = "0.0.2", path = "../libcgroups" } +libcontainer = { version = "0.0.2", path = "../libcontainer" } +liboci-cli = { version = "0.0.2", path = "../liboci-cli" } log = { version = "0.4", features = ["std"]} nix = "0.23.1" oci-spec = "0.5.3"