Unverified Commit 74294d76 by Stéphane Graber Committed by GitHub

Merge pull request #3577 from brauner/2020-11-05/bugfixes

attach: silence stdio permission adjust warnings
parents 056b6a60 a2c26bef
...@@ -883,7 +883,7 @@ static int attach_child_main(struct attach_clone_payload *payload) ...@@ -883,7 +883,7 @@ static int attach_child_main(struct attach_clone_payload *payload)
/* Make sure that the processes STDIO is correctly owned by the user that we are switching to */ /* Make sure that the processes STDIO is correctly owned by the user that we are switching to */
ret = fix_stdio_permissions(new_uid); ret = fix_stdio_permissions(new_uid);
if (ret) if (ret)
WARN("Failed to adjust stdio permissions"); INFO("Failed to adjust stdio permissions");
if (!lxc_switch_uid_gid(new_uid, new_gid)) if (!lxc_switch_uid_gid(new_uid, new_gid))
goto on_error; goto on_error;
......
...@@ -1885,11 +1885,11 @@ int fix_stdio_permissions(uid_t uid) ...@@ -1885,11 +1885,11 @@ int fix_stdio_permissions(uid_t uid)
devnull_fd = open_devnull(); devnull_fd = open_devnull();
if (devnull_fd < 0) if (devnull_fd < 0)
return log_warn_errno(-1, errno, "Failed to open \"/dev/null\""); return log_trace_errno(-1, errno, "Failed to open \"/dev/null\"");
ret = fstat(devnull_fd, &st_null); ret = fstat(devnull_fd, &st_null);
if (ret) if (ret)
return log_warn_errno(-errno, errno, "Failed to stat \"/dev/null\""); return log_trace_errno(-errno, errno, "Failed to stat \"/dev/null\"");
for (int i = 0; i < ARRAY_SIZE(std_fds); i++) { for (int i = 0; i < ARRAY_SIZE(std_fds); i++) {
ret = fstat(std_fds[i], &st); ret = fstat(std_fds[i], &st);
...@@ -1904,14 +1904,15 @@ int fix_stdio_permissions(uid_t uid) ...@@ -1904,14 +1904,15 @@ int fix_stdio_permissions(uid_t uid)
ret = fchown(std_fds[i], uid, st.st_gid); ret = fchown(std_fds[i], uid, st.st_gid);
if (ret) { if (ret) {
SYSWARN("Failed to chown standard I/O file descriptor %d to uid %d and gid %d", TRACE("Failed to chown standard I/O file descriptor %d to uid %d and gid %d",
std_fds[i], uid, st.st_gid); std_fds[i], uid, st.st_gid);
fret = -1; fret = -1;
continue;
} }
ret = fchmod(std_fds[i], 0700); ret = fchmod(std_fds[i], 0700);
if (ret) { if (ret) {
SYSWARN("Failed to chmod standard I/O file descriptor %d", std_fds[i]); TRACE("Failed to chmod standard I/O file descriptor %d", std_fds[i]);
fret = -1; fret = -1;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment