mirror/youki
1
0
Fork 0
mirror of https://github.com/containers/youki synced 2024-11-22 17:02:00 +01:00
Code Issues

Fixed ENAMETOOLONG error in setup_console_socket (#2915)

Browse Source 
* Fixed ENAMETOOLONG error in setup_console_socket

Signed-off-by: morganllewellynjones <morganjones.gm@gmail.com>

* Update crates/libcontainer/src/tty.rs

Co-authored-by: Toru Komatsu <k0ma@utam0k.jp>

---------

Signed-off-by: morganllewellynjones <morganjones.gm@gmail.com>
Co-authored-by: Toru Komatsu <k0ma@utam0k.jp>
This commit is contained in:
morganllewellynjones 2024-09-29 21:34:40 -07:00 committed by GitHub
parent 44ca398f2a
commit 3aa41cf5fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/libcontainer/src/tty.rs
View File

@ -1,5 +1,6 @@
//! tty (teletype) for user-system interaction //! tty (teletype) for user-system interaction
use std::env;
use std::io::IoSlice; use std::io::IoSlice;
use std::os::unix::fs::symlink; use std::os::unix::fs::symlink;
use std::os::unix::io::AsRawFd; use std::os::unix::io::AsRawFd;
@ -75,7 +76,14 @@ pub fn setup_console_socket(
console_socket_path: &Path, console_socket_path: &Path,
socket_name: &str, socket_name: &str,
) -> Result<RawFd> { ) -> Result<RawFd> {
let linked = container_dir.join(socket_name); // Move into the container directory to avoid sun family conflicts with long socket path names.
// ref: https://github.com/containers/youki/issues/2910
let prev_dir = env::current_dir().unwrap();
let _ = env::set_current_dir(container_dir);
let linked = PathBuf::from(socket_name);
symlink(console_socket_path, &linked).map_err(|err| TTYError::Symlink { symlink(console_socket_path, &linked).map_err(|err| TTYError::Symlink {
source: err, source: err,
linked: linked.to_path_buf().into(), linked: linked.to_path_buf().into(),
@ -105,6 +113,8 @@ pub fn setup_console_socket(
})?, })?,
Ok(()) => csocketfd.as_raw_fd(), Ok(()) => csocketfd.as_raw_fd(),
}; };
let _ = env::set_current_dir(prev_dir);
Ok(csocketfd) Ok(csocketfd)
} }