Skip to content

Commit 8e83c66

Browse files
AkihiroSudajessfraz
authored andcommitted
unshare: bail if USER is empty (#88)
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
1 parent 1da0e47 commit 8e83c66

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,6 @@ ENV HOME /home/user
3737
RUN useradd --create-home --home-dir $HOME user \
3838
&& chown -R user:user $HOME /run /tmp
3939
USER user
40+
ENV USER user
4041
ENTRYPOINT [ "img" ]
4142
CMD [ "--help" ]

unshare/unshare.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,8 @@ static char *read_ranges(int type) {
266266
uid = getuid();
267267
user = getenv("USER");
268268
user = user ? user : getlogin();
269+
if (user == NULL)
270+
bail("USER is unset");
269271

270272
while (getline(&line, &size, file) >= 0) {
271273
if (strtol(line, &entry, 10) != uid || entry == line) {

0 commit comments

Comments
 (0)