This repository has been archived by the owner on Feb 24, 2020. It is now read-only.
stage1: Fix segfault in enterexec #2608
Merged
Conversation
This file contains 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
euank
force-pushed
the
stage1-enter-segfault
branch
from
2bdb549
to
3d541dc
Compare
| if (entering) { | ||
| // enter is typically interactive; ensure we always have a sane enough term | ||
| // variable. | ||
| if(term == NULL) { |
There was a problem hiding this comment.
please add a space before the opening parenthesis
| // enter is typically interactive; ensure we always have a sane enough term | ||
| // variable. | ||
| if(term == NULL) { | ||
| setenv("TERM", "xterm", 1); |
There was a problem hiding this comment.
I would prefer in this place more simple vt100 assumption.
euank
force-pushed
the
stage1-enter-segfault
branch
from
3d541dc
to
e04ad92
Compare
Prior to this commit, if `rkt enter` was executed without the `TERM` environment variable set, a segfault could occur. This commit treats an empty TERM environment variable as meaning 'xterm' and avoids the segfault.
|
Addressed both comments as suggested, PTAL |
|
LGTM on green |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Prior to this commit, if
rkt enterwas executed without theTERMenvironment variable set, a segfault could occur.
This commit treats an unset TERM environment variable as meaning 'xterm'
and avoids the segfault.
This is more noticeable in environments where rkt is the child of some non-terminal process (e.g. the kubelet).
Related to kubernetes/kubernetes#25430
I reproduced this via
sudo sh -c 'unset TERM && rkt enter $uid ls'on my machine, though I'm not certain that it reproduces consistently on all machines. I could not reproduce it after this change.I wasn't sure if it was preferable to leave
TERMblank when it is unset for the caller and I'm open for any discussion / arguments there.cc @dgonyeo