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: move join namespace inside child process #5889

Merged
merged 2 commits into from
Apr 20, 2020
Merged

rootless: move join namespace inside child process #5889

merged 2 commits into from
Apr 20, 2020

Conversation

giuseppe
Copy link
Member

open the namespace file descriptors inside of the child process.

Closes: #5873

Signed-off-by: Giuseppe Scrivano gscrivan@redhat.com

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe

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

The pull request process is described here

Needs approval from an approver in each of these files:

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 20, 2020
@mheon
Copy link
Member

mheon commented Apr 20, 2020

In function 'join_namespace_or_die':\nrootless_linux.c:544:30: error: format '%ld' expects argument of type 'long int', but argument 3 has type 'int' [-Werror=format=]\n

@mheon
Copy link
Member

mheon commented Apr 20, 2020

LGTM once that is addressed, though. Should we consider backport against 1.9?

jwhonce
jwhonce requested changes Apr 20, 2020
View reviewed changes
pkg/rootless/rootless_linux.c Outdated Show resolved Hide resolved
@giuseppe
Copy link
Member Author

LGTM once that is addressed, though. Should we consider backport against 1.9?

comments addressed.

Yes, I think we should backport it. I'll prepare it once this one is merged

@rhatdan
Copy link
Member

rhatdan commented Apr 20, 2020

Still blocked by gating, but LGTM

giuseppe added 2 commits April 20, 2020 17:40
@giuseppe
rootless: skip looking up parent user ns
8360fcf 
since we join directly the conmon user namespace, there is no need to
look up its parent user namespace, as we can safely assume it is the
init namespace.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
@giuseppe
rootless: move join namespace inside child process
788fdc6 
open the namespace file descriptors inside of the child process.

Closes: containers#5873

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
TomSweeneyRedHat
TomSweeneyRedHat reviewed Apr 20, 2020
View reviewed changes
Copy link
Member

@TomSweeneyRedHat TomSweeneyRedHat left a comment

Choose a reason for hiding this comment

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

LGTM assuming happy tests

@rhatdan
Copy link
Member

rhatdan commented Apr 20, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 20, 2020
@openshift-merge-robot openshift-merge-robot merged commit 354088a into containers:master Apr 20, 2020
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 25, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 25, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@TomSweeneyRedHat TomSweeneyRedHat TomSweeneyRedHat left review comments

@jwhonce jwhonce jwhonce requested changes

@rhatdan rhatdan Awaiting requested review from rhatdan

Assignees

@rhatdan rhatdan

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

ERRO[0131] unable to close namespace: "close /proc/%/ns/user: bad file descriptor"
7 participants
@giuseppe @openshift-ci-robot @mheon @rhatdan @jwhonce @TomSweeneyRedHat @openshift-merge-robot