-
Notifications
You must be signed in to change notification settings - Fork 3.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[release/1.7] Support for dropping inheritable capabilities #10469
Merged
mikebrow
merged 1 commit into
containerd:release/1.7
from
dims:automated-cherry-pick-of-#8356-upstream-release-1.7
Jul 16, 2024
Merged
[release/1.7] Support for dropping inheritable capabilities #10469
mikebrow
merged 1 commit into
containerd:release/1.7
from
dims:automated-cherry-pick-of-#8356-upstream-release-1.7
Jul 16, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Derek McGowan <derek@mcg.dev>
estesp
approved these changes
Jul 16, 2024
mikebrow
approved these changes
Jul 16, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Mengkzhaoyun
pushed a commit
to open-beagle/containerd
that referenced
this pull request
Aug 27, 2024
containerd 1.7.20 Welcome to the v1.7.20 release of containerd! The twentieth patch release for containerd 1.7 contains various fixes and updates. * Support for dropping inheritable capabilities ([#10469](containerd/containerd#10469)) * Make PodSandboxStatus friendlier to shim crashes ([#10461](containerd/containerd#10461)) * Handle empty DNSConfig differently than unspecified ([#10462](containerd/containerd#10462)) * Fix for `[cri] ttrpc: closed` during ListPodSandboxStats ([#10423](containerd/containerd#10423)) Please try out the release binaries and report any issues at https://github.com/containerd/containerd/issues. * Derek McGowan * Akihiro Suda * Phil Estes * Akhil Mohan * Bryant Biggs * Danny Canter * Davanum Srinivas * Mike Brown * Samuel Karp * Tim Hockin <details><summary>16 commits</summary> <p> * Prepare release notes for v1.7.20 ([#10481](containerd/containerd#10481)) * [`7f2d4cd97`](containerd/containerd@7f2d4cd) Prepare release notes for v1.7.20 * deps: Update otelgrpc ([#10413](containerd/containerd#10413)) * [`3a02c523d`](containerd/containerd@3a02c52) deps: Update otelgrpc * Make PodSandboxStatus friendlier to shim crashes ([#10461](containerd/containerd#10461)) * [`df86bdd5d`](containerd/containerd@df86bdd) CRI Sbserver: Make PodSandboxStatus friendlier to shim crashes * Handle empty DNSConfig differently than unspecified ([#10462](containerd/containerd#10462)) * [`209ee4f10`](containerd/containerd@209ee4f) CRI: An empty DNSConfig != unspecified * Support for dropping inheritable capabilities ([#10469](containerd/containerd#10469)) * [`ce65228af`](containerd/containerd@ce65228) Support for dropping inheritable capabilities * Fix for `[cri] ttrpc: closed` during ListPodSandboxStats ([#10423](containerd/containerd#10423)) * [`610498df7`](containerd/containerd@610498d) Fix for `[cri] ttrpc: closed` during ListPodSandboxStats * update to go1.21.12 / go1.22.5 ([#10426](containerd/containerd#10426)) * [`e61c7932e`](containerd/containerd@e61c793) update to go1.21.12 / go1.22.5 * errdefs: denote deprecation as a godoc comment ([#10424](containerd/containerd#10424)) * [`c7d5e430a`](containerd/containerd@c7d5e43) errdefs: denote deprecation as a godoc comment </p> </details> * **github.com/go-logr/logr** v1.2.4 -> v1.3.0 * **github.com/google/go-cmp** v0.5.9 -> v0.6.0 * **github.com/google/uuid** v1.3.1 -> v1.4.0 * **go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc** v0.45.0 -> v0.46.1 * **go.opentelemetry.io/otel** v1.19.0 -> v1.21.0 * **go.opentelemetry.io/otel/metric** v1.19.0 -> v1.21.0 * **go.opentelemetry.io/otel/sdk** v1.19.0 -> v1.21.0 * **go.opentelemetry.io/otel/trace** v1.19.0 -> v1.21.0 * **google.golang.org/genproto** e6e6cdab5c13 -> 989df2bf70f3 * **google.golang.org/genproto/googleapis/api** 007df8e322eb -> 83a465c0220f * **google.golang.org/genproto/googleapis/rpc** d307bd883b97 -> 995d672761c0 Previous release can be found at [v1.7.19](https://github.com/containerd/containerd/releases/tag/v1.7.19)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry pick for - #8356
The inheritable capabilities set should never be larger than the bounding capabilities set. When a base spec is provided with non-empty inheritable capabilities today, the container will fail to run when those capabilities are explicitly dropped. This issue is only seen when a base spec with inheritable capabilities is explicitly provided in the configuration file, the default spec already removed inheritable capabilities in GHSA-c9cp-9c75-9v8c. Since the container is unable to start with this setup, there is no security concern. It may be worth a discussion whether more should be done to warn users who may have set this in their configuration before the GHSA, whether through logging or our documentation.
The error seen when dropping the bounding capabilities to less than the inheritable capabilities is