Skip to content
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

rootless: fix potential panic in shouldUseRootlessCgroupManager #1928

Merged
merged 1 commit into from
Nov 13, 2018
Merged

rootless: fix potential panic in shouldUseRootlessCgroupManager #1928

merged 1 commit into from
Nov 13, 2018

Conversation

Ace-Tang
Copy link
Contributor

move context.GlobalBool("systemd-cgroup") inside if condition context != nil

if context != nil {
.....

        if context.GlobalBool("systemd-cgroup") {
			return false, nil
	}
}

@Ace-Tang
rootless: fix potential panic in shouldUseRootlessCgroupManager
714a4d4 
Signed-off-by: Ace-Tang <aceapril@126.com>
@crosbymichael
Copy link
Member

crosbymichael commented Nov 12, 2018 •
edited by caniszczyk
Loading

LGTM

Approved with PullApprove

@cyphar
Copy link
Member

cyphar commented Nov 13, 2018 •
edited by caniszczyk
Loading

LGTM.

Approved with PullApprove

@cyphar cyphar merged commit 714a4d4 into opencontainers:master Nov 13, 2018
cyphar added a commit that referenced this pull request Nov 13, 2018
@cyphar
merge branch 'pr-1928'
bb522d6 
  rootless: fix potential panic in shouldUseRootlessCgroupManager

LGTMs: @crosbymichael @cyphar
Closes #1928
@Ace-Tang Ace-Tang deleted the fix_rootless branch November 13, 2018 07:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Ace-Tang @crosbymichael @cyphar