github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-21 10:51:05 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: Update tokio dependency

Browse Source 
- Bump tokio to 1.38.0 to fix the security vulnerability
https://rustsec.org/advisories/RUSTSEC-2024-0019

If possible it would be good to add the many runtime-rs creates into the
runtime-rs workspace and provide a centralised version to avoid the updates
in many places.

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This commit is contained in:
stevenhorsman 2024-06-17 12:10:05 +01:00
parent 3bb1a67d80
commit 35f6be97df
13 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/runtime-rs/Cargo.lock generated
View File

@ -185,7 +185,7 @@ dependencies = [
"polling",
"rustix 0.37.23",
"slab",
"socket2",
"socket2 0.4.9",
"waker-fn",
]
@ -1589,7 +1589,7 @@ dependencies = [
"httpdate",
"itoa",
"pin-project-lite",
"socket2",
"socket2 0.4.9",
"tokio",
"tower-service",
"tracing",
@ -2034,9 +2034,9 @@ dependencies = [
[[package]]
name = "mio"
version = "0.8.8"
version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
dependencies = [
"libc",
"log",
@ -2699,9 +2699,9 @@ dependencies = [
[[package]]
name = "pin-project-lite"
version = "0.2.10"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
[[package]]
name = "pin-utils"
@ -3825,6 +3825,16 @@ dependencies = [
"winapi",
]
[[package]]
name = "socket2"
version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
dependencies = [
"libc",
"windows-sys 0.52.0",
]
[[package]]
name = "static_assertions"
version = "1.1.0"
@ -4099,11 +4109,10 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
version = "1.29.1"
version = "1.38.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
dependencies = [
"autocfg",
"backtrace",
"bytes",
"libc",
@ -4112,16 +4121,16 @@ dependencies = [
"parking_lot 0.12.1",
"pin-project-lite",
"signal-hook-registry",
"socket2",
"socket2 0.5.7",
"tokio-macros",
"windows-sys 0.48.0",
]
[[package]]
name = "tokio-macros"
version = "2.1.0"
version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
dependencies = [
"proc-macro2",
"quote",

8
src/runtime-rs/crates/agent/Cargo.toml
View File

@ -18,15 +18,15 @@ serde_json = ">=1.0.9"
slog = "2.5.2"
slog-scope = "4.4.0"
ttrpc = "0.8"
tokio = { version = "1.28.1", features = ["fs", "rt"] }
tokio = { version = "1.38.0", features = ["fs", "rt"] }
tracing = "0.1.36"
url = "2.2.2"
nix = "0.24.2"
kata-types = { path = "../../../libs/kata-types"}
logging = { path = "../../../libs/logging"}
kata-types = { path = "../../../libs/kata-types" }
logging = { path = "../../../libs/logging" }
oci = { path = "../../../libs/oci" }
protocols = { path = "../../../libs/protocols", features=["async"] }
protocols = { path = "../../../libs/protocols", features = ["async"] }
[features]
default = []

2
src/runtime-rs/crates/hypervisor/Cargo.toml
View File

@ -22,7 +22,7 @@ serde_json = ">=1.0.9"
slog = "2.5.2"
slog-scope = "4.4.0"
thiserror = "1.0"
tokio = { version = "1.28.1", features = ["sync", "fs", "process", "io-util"] }
tokio = { version = "1.38.0", features = ["sync", "fs", "process", "io-util"] }
vmm-sys-util = "0.11.0"
rand = "0.8.4"
path-clean = "1.0.1"

2
src/runtime-rs/crates/hypervisor/ch-config/Cargo.toml
View File

@ -13,7 +13,7 @@ edition = "2021"
anyhow = "1.0.68"
serde = { version = "1.0.145", features = ["rc", "derive"] }
serde_json = "1.0.91"
tokio = { version = "1.28.1", features = ["sync", "rt"] }
tokio = { version = "1.38.0", features = ["sync", "rt"] }
# Cloud Hypervisor public HTTP API functions
# Note that the version specified is not necessarily the version of CH

4
src/runtime-rs/crates/resource/Cargo.toml
View File

@ -30,7 +30,7 @@ serde = { version = "1.0.138", features = ["derive"] }
serde_json = "1.0.82"
slog = "2.5.2"
slog-scope = "4.4.0"
tokio = { version = "1.28.1", features = ["process"] }
tokio = { version = "1.38.0", features = ["process"] }
tracing = "0.1.36"
uuid = { version = "0.4", features = ["v4"] }
@ -40,7 +40,7 @@ kata-types = { path = "../../../libs/kata-types" }
kata-sys-util = { path = "../../../libs/kata-sys-util" }
logging = { path = "../../../libs/logging" }
oci = { path = "../../../libs/oci" }
persist = { path = "../persist"}
persist = { path = "../persist" }
tests_utils = { path = "../../tests/utils" }
[features]

2
src/runtime-rs/crates/runtimes/Cargo.toml
View File

@ -11,7 +11,7 @@ lazy_static = "1.4.0"
netns-rs = "0.1.0"
slog = "2.5.2"
slog-scope = "4.4.0"
tokio = { version = "1.28.1", features = ["rt-multi-thread"] }
tokio = { version = "1.38.0", features = ["rt-multi-thread"] }
tracing = "0.1.36"
tracing-opentelemetry = "0.18.0"
opentelemetry = { version = "0.18.0", features = ["rt-tokio-current-thread", "trace", "rt-tokio"] }

7
src/runtime-rs/crates/runtimes/common/Cargo.toml
View File

@ -10,7 +10,7 @@ license = "Apache-2.0"
[dependencies]
anyhow = "^1.0"
async-trait = "0.1.48"
containerd-shim-protos = { version = "0.6.0", features = ["async"]}
containerd-shim-protos = { version = "0.6.0", features = ["async"] }
lazy_static = "1.4.0"
nix = "0.24.2"
protobuf = "3.2.0"
@ -19,12 +19,11 @@ slog = "2.5.2"
slog-scope = "4.4.0"
strum = { version = "0.24.0", features = ["derive"] }
thiserror = "^1.0"
tokio = { version = "1.28.1", features = ["rt-multi-thread", "process", "fs"] }
tokio = { version = "1.38.0", features = ["rt-multi-thread", "process", "fs"] }
ttrpc = "0.8"
persist = {path = "../../persist"}
persist = { path = "../../persist" }
agent = { path = "../../agent" }
kata-sys-util = { path = "../../../../libs/kata-sys-util" }
kata-types = { path = "../../../../libs/kata-types" }
oci = { path = "../../../../libs/oci" }
resource = { path = "../../resource" }

2
src/runtime-rs/crates/runtimes/linux_container/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
anyhow = "^1.0"
async-trait = "0.1.48"
tokio = { version = "1.28.1" }
tokio = { version = "1.38.0" }
common = { path = "../common" }
kata-types = { path = "../../../../libs/kata-types" }

8
src/runtime-rs/crates/runtimes/virt_container/Cargo.toml
View File

@ -9,7 +9,7 @@ license = "Apache-2.0"
anyhow = "^1.0"
async-trait = "0.1.48"
awaitgroup = "0.6.0"
containerd-shim-protos = { version = "0.6.0", features = ["async"]}
containerd-shim-protos = { version = "0.6.0", features = ["async"] }
futures = "0.3.19"
lazy_static = "1.4.0"
libc = ">=0.2.39"
@ -21,7 +21,7 @@ serde_derive = "1.0.27"
serde_json = "1.0.82"
slog = "2.5.2"
slog-scope = "4.4.0"
tokio = { version = "1.28.1" }
tokio = { version = "1.38.0" }
toml = "0.4.2"
url = "2.1.1"
async-std = "1.12.0"
@ -32,9 +32,9 @@ common = { path = "../common" }
hypervisor = { path = "../../hypervisor", features = ["cloud-hypervisor"] }
kata-sys-util = { path = "../../../../libs/kata-sys-util" }
kata-types = { path = "../../../../libs/kata-types" }
logging = { path = "../../../../libs/logging"}
logging = { path = "../../../../libs/logging" }
oci = { path = "../../../../libs/oci" }
persist = { path = "../../persist"}
persist = { path = "../../persist" }
resource = { path = "../../resource" }
[features]

2
src/runtime-rs/crates/runtimes/wasm_container/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
anyhow = "^1.0"
async-trait = "0.1.48"
tokio = { version = "1.28.1" }
tokio = { version = "1.38.0" }
common = { path = "../common" }
kata-types = { path = "../../../../libs/kata-types" }

6
src/runtime-rs/crates/service/Cargo.toml
View File

@ -10,14 +10,14 @@ anyhow = "^1.0"
async-trait = "0.1.48"
slog = "2.5.2"
slog-scope = "4.4.0"
tokio = { version = "1.28.1", features = ["rt-multi-thread"] }
tokio = { version = "1.38.0", features = ["rt-multi-thread"] }
tracing = "0.1.36"
ttrpc = "0.8"
common = { path = "../runtimes/common" }
containerd-shim-protos = { version = "0.6.0", features = ["async"]}
containerd-shim-protos = { version = "0.6.0", features = ["async"] }
containerd-shim = { version = "0.6.0", features = ["async"] }
logging = { path = "../../../libs/logging"}
logging = { path = "../../../libs/logging" }
kata-types = { path = "../../../libs/kata-types" }
runtimes = { path = "../runtimes" }
persist = { path = "../persist" }

2
src/runtime-rs/crates/shim-ctl/Cargo.toml
View File

@ -10,5 +10,5 @@ anyhow = "^1.0"
common = { path = "../runtimes/common" }
logging = { path = "../../../libs/logging"}
runtimes = { path = "../runtimes" }
tokio = { version = "1.28.1", features = [ "rt", "rt-multi-thread" ] }
tokio = { version = "1.38.0", features = [ "rt", "rt-multi-thread" ] }

2
src/runtime-rs/crates/shim/Cargo.toml
View File

@ -27,7 +27,7 @@ slog-async = "2.5.2"
slog-scope = "4.4.0"
slog-stdlog = "4.1.0"
thiserror = "1.0.30"
tokio = { version = "1.28.1", features = [ "rt", "rt-multi-thread" ] }
tokio = { version = "1.38.0", features = [ "rt", "rt-multi-thread" ] }
unix_socket2 = "0.5.4"
tracing = "0.1.36"
tracing-opentelemetry = "0.18.0"