Thanks to visit codestin.com
Credit goes to github.com

Skip to content

server: prevent segfault by not using a potentially nil sandbox #5060

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.

Sign up for GitHub

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

Jump to bottom
Merged
openshift-merge-robot merged 1 commit into from
Jul 8, 2021
Merged

server: prevent segfault by not using a potentially nil sandbox #5060

openshift-merge-robot merged 1 commit into from
Jul 8, 2021
+1 −1

Conversation

@haircommander
Copy link
Member

@haircommander haircommander commented Jul 7, 2021 •
edited
Loading

Signed-off-by: Peter Hunt [email protected]

What type of PR is this?

/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

none

@openshift-ci openshift-ci bot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/bug Categorizes issue or PR as related to a bug. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jul 7, 2021
@openshift-ci openshift-ci bot requested review from sameo and umohnani8 July 7, 2021 15:34
@openshift-ci openshift-ci bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jul 7, 2021
@codecov
Copy link

codecov bot commented Jul 7, 2021

Codecov Report

Merging #5060 (94be304) into master (cd7f051) will decrease coverage by 0.06%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##           master    #5060      +/-   ##
==========================================
- Coverage   41.72%   41.65%   -0.07%     
==========================================
  Files         108      108              
  Lines       10158    10195      +37     
==========================================
+ Hits         4238     4247       +9     
- Misses       5471     5498      +27     
- Partials      449      450       +1

saschagrunert
saschagrunert approved these changes Jul 8, 2021
View reviewed changes
Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/retest
LGTM

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 8, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, saschagrunert

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [haircommander,saschagrunert]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 8, 2021 •
edited
Loading

@haircommander: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/openshift-jenkins/e2e_crun_cgroupv2 94be304 link /test e2e_cgroupv2

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@saschagrunert
Copy link
Member

saschagrunert commented Jul 8, 2021

/override ci/prow/e2e-agnostic
/override ci/prow/e2e-gcp

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 8, 2021

@saschagrunert: Overrode contexts on behalf of saschagrunert: ci/prow/e2e-agnostic, ci/prow/e2e-gcp

Details

In response to this:

/override ci/prow/e2e-agnostic
/override ci/prow/e2e-gcp

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@saschagrunert
Copy link
Member

saschagrunert commented Jul 8, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 8, 2021
@openshift-merge-robot openshift-merge-robot merged commit feb7a4c into cri-o:master Jul 8, 2021
@haircommander
Copy link
Member Author

haircommander commented Jul 8, 2021

/cherry-pick release-1.21

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Jul 8, 2021

@haircommander: new pull request created: #5062

Details

In response to this:

/cherry-pick release-1.21

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jul 8, 2021
Merged
@haircommander
Copy link
Member Author

haircommander commented Jul 8, 2021

/cherry-pick release-1.20

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Jul 8, 2021

@haircommander: #5060 failed to apply on top of branch "release-1.20":

Applying: server: prevent segfault by not using a potentially nil sandbox
Using index info to reconstruct a base tree...
M	server/sandbox_stop.go
Falling back to patching base and 3-way merge...
Auto-merging server/sandbox_stop.go
CONFLICT (content): Merge conflict in server/sandbox_stop.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 server: prevent segfault by not using a potentially nil sandbox
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherry-pick release-1.20

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@saschagrunert saschagrunert saschagrunert approved these changes

@mrunalp mrunalp Awaiting requested review from mrunalp

@runcom runcom Awaiting requested review from runcom

@sameo sameo Awaiting requested review from sameo

@umohnani8 umohnani8 Awaiting requested review from umohnani8

Assignees

@saschagrunert saschagrunert

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@haircommander @saschagrunert @openshift-cherrypick-robot @openshift-merge-robot