refactor: ignore other return values when an error occurs#5369
Open
lifubang wants to merge 1 commit into
Open
Conversation
we shouldn't trust `waitKill` when we got the error `EINVAL`. Suggested-by: Sebastiaan van Stijn <github@gone.nl> Co-authored-by: Sebastiaan van Stijn <github@gone.nl> Signed-off-by: lifubang <lifubang@acmcoder.com>
cyphar
reviewed
Jul 14, 2026
Comment on lines
+676
to
682
| if waitKill, err := filter.GetWaitKill(); err != nil { | ||
| if !errors.Is(err, unix.EINVAL) { | ||
| return 0, false, fmt.Errorf("unable to fetch SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV bit: %w", err) | ||
| } | ||
| } else if waitKill { | ||
| flags |= uint(C.C_FILTER_FLAG_WAIT_KILLABLE_RECV) | ||
| } |
Member
There was a problem hiding this comment.
If we really want to switch it over, I think better describes what we are doing, but I don't really mind too much either way.
Suggested change
| if waitKill, err := filter.GetWaitKill(); err != nil { | |
| if !errors.Is(err, unix.EINVAL) { | |
| return 0, false, fmt.Errorf("unable to fetch SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV bit: %w", err) | |
| } | |
| } else if waitKill { | |
| flags |= uint(C.C_FILTER_FLAG_WAIT_KILLABLE_RECV) | |
| } | |
| waitKill, err := filter.GetWaitKill() | |
| if errors.Is(err, unix.EINVAL) { | |
| waitKill, err = false, nil | |
| } | |
| if err != nil { | |
| return 0, false, fmt.Errorf("unable to fetch SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV bit: %w", err) | |
| } | |
| if waitKill { | |
| flags |= uint(C.C_FILTER_FLAG_WAIT_KILLABLE_RECV) | |
| } |
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
2 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.
we shouldn't trust
waitKillwhen we got the errorEINVAL.Ref:
#5367 (comment)
#5367 (comment)