Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lxc
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
lxc
Commits
6aff5157
Commit
6aff5157
authored
Apr 01, 2020
by
gaohuatao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix non-root user cannot write /dev/stdout
Signed-off-by:
gaohuatao
<
gaohuatao@huawei.com
>
parent
f66fdf23
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
54 additions
and
0 deletions
+54
-0
attach.c
src/lxc/attach.c
+3
-0
start.c
src/lxc/start.c
+3
-0
utils.c
src/lxc/utils.c
+45
-0
utils.h
src/lxc/utils.h
+3
-0
No files found.
src/lxc/attach.c
View file @
6aff5157
...
@@ -875,6 +875,9 @@ static int attach_child_main(struct attach_clone_payload *payload)
...
@@ -875,6 +875,9 @@ static int attach_child_main(struct attach_clone_payload *payload)
if
(
new_gid
==
ns_root_gid
)
if
(
new_gid
==
ns_root_gid
)
new_gid
=
LXC_INVALID_GID
;
new_gid
=
LXC_INVALID_GID
;
/* Make sure that the processes STDIO is correctly owned by the user that we are switching to */
fix_stdio_permissions
(
new_uid
);
if
(
!
lxc_switch_uid_gid
(
new_uid
,
new_gid
))
if
(
!
lxc_switch_uid_gid
(
new_uid
,
new_gid
))
goto
on_error
;
goto
on_error
;
...
...
src/lxc/start.c
View file @
6aff5157
...
@@ -1365,6 +1365,9 @@ static int do_start(void *data)
...
@@ -1365,6 +1365,9 @@ static int do_start(void *data)
if
(
new_gid
==
nsgid
)
if
(
new_gid
==
nsgid
)
new_gid
=
LXC_INVALID_GID
;
new_gid
=
LXC_INVALID_GID
;
/* Make sure that the processes STDIO is correctly owned by the user that we are switching to */
fix_stdio_permissions
(
new_uid
);
/* If we are in a new user namespace we already dropped all groups when
/* If we are in a new user namespace we already dropped all groups when
* we switched to root in the new user namespace further above. Only
* we switched to root in the new user namespace further above. Only
...
...
src/lxc/utils.c
View file @
6aff5157
...
@@ -1860,3 +1860,48 @@ bool lxc_can_use_pidfd(int pidfd)
...
@@ -1860,3 +1860,48 @@ bool lxc_can_use_pidfd(int pidfd)
return
log_trace
(
true
,
"Kernel supports pidfds"
);
return
log_trace
(
true
,
"Kernel supports pidfds"
);
}
}
void
fix_stdio_permissions
(
uid_t
uid
)
{
int
std_fds
[
3
]
=
{
STDIN_FILENO
,
STDOUT_FILENO
,
STDERR_FILENO
};
int
devnull_fd
=
-
1
;
int
ret
;
int
i
=
0
;
struct
stat
st
;
struct
stat
null_st
;
devnull_fd
=
open_devnull
();
if
(
devnull_fd
<
0
)
{
ERROR
(
"Open /dev/null failed"
);
goto
out
;
}
ret
=
fstat
(
devnull_fd
,
&
null_st
);
for
(;
i
<
3
;
i
++
)
{
ret
=
fstat
(
std_fds
[
i
],
&
st
);
if
(
ret
!=
0
)
{
ERROR
(
"Failed to get fd %d stat"
,
std_fds
[
i
]);
continue
;
}
if
(
st
.
st_rdev
==
null_st
.
st_rdev
)
{
continue
;
}
ret
=
fchown
(
std_fds
[
i
],
uid
,
st
.
st_gid
);
if
(
ret
!=
0
)
{
ERROR
(
"Failed to change fd %d owner"
,
std_fds
[
i
]);
}
ret
=
fchmod
(
std_fds
[
i
],
0700
);
if
(
ret
!=
0
)
{
ERROR
(
"Failed to change fd %d mode"
,
std_fds
[
i
]);
}
}
out:
if
(
devnull_fd
>=
0
)
{
close
(
devnull_fd
);
}
}
src/lxc/utils.h
View file @
6aff5157
...
@@ -239,4 +239,7 @@ extern int lxc_rm_rf(const char *dirname);
...
@@ -239,4 +239,7 @@ extern int lxc_rm_rf(const char *dirname);
extern
int
lxc_setup_keyring
(
char
*
keyring_label
);
extern
int
lxc_setup_keyring
(
char
*
keyring_label
);
extern
bool
lxc_can_use_pidfd
(
int
pidfd
);
extern
bool
lxc_can_use_pidfd
(
int
pidfd
);
/* Fix the permissions of init PID's STDIO within the container to the specified user */
extern
void
fix_stdio_permissions
(
uid_t
uid
);
#endif
/* __LXC_UTILS_H */
#endif
/* __LXC_UTILS_H */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment