BUG: define ActKillThread equal to ActKill, and deprecated ActKill#90
Closed
thaJeztah wants to merge 2 commits intoseccomp:mainfrom
Closed
BUG: define ActKillThread equal to ActKill, and deprecated ActKill#90thaJeztah wants to merge 2 commits intoseccomp:mainfrom
thaJeztah wants to merge 2 commits intoseccomp:mainfrom
Conversation
Contributor
thaJeztah
commented
Apr 22, 2022
- Carry of / closes BUG: define ActKillThread equal to ActKill #85 (second commit is new)
- relates to / addresses BUG: unable to compile on Archlinux #89
- relates to / addresses Bump github.com/containerd/containerd from v1.6.0-beta.3 to v1.6.0-rc.1 moby/buildkit#2584
These constants are equal in libseccomp but Go definitions were defined separately. This resulted in dead code that never executed due to identical case statements in switch. Go can usually detect these error cases and refuses to build but for some reason this detection doesn’t work with cgo+gcc. Clang detects the equal constants correctly and therefore libseccomp-golang builds with clang broke after ActKillThread was added. In order to fix the clang build only removal of the switch case is needed. But I assumed that the setter/getter logic is supposed to work for ActKillThread as well and only way to ensure that is to set them equal like they are in C. Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Contributor
Author
|
@tonistiigi @pcmoore @kolyshkin PTAL (I see there's no CI running in this repo, so could use the eyes to double-check this is good) |
Contributor
Author
|
oh, never mind; I was typing too fast; it's just waiting approval to run 😂 |
Contributor
Author
|
oh, let me ping @drakenclimber as well (I see I forgot) as they reviewed the original PR; ptal 🤗 |
kolyshkin
approved these changes
Apr 28, 2022
Contributor
kolyshkin
left a comment
There was a problem hiding this comment.
LGTM, and also addresses #85 (comment)
Contributor
|
@drakenclimber @pcmoore PTAL 🙏🏻 |
drakenclimber
approved these changes
Apr 28, 2022
Member
drakenclimber
left a comment
There was a problem hiding this comment.
Looks good to me. Thanks @thaJeztah
Acked-by: Tom Hromatka <tom.hromatka@oracle.com>
Member
|
Merged at HEAD f33da4d, thank you! |
Contributor
Author
|
Thank you! |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.