Fix build with musl

cea-sec · Aug 20, 2024 · 717e0f4 · 717e0f4
1 parent 7ba9d30
commit 717e0f4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/usbsas-sandbox/src/fswriter.rs b/usbsas-sandbox/src/fswriter.rs
@@ -23,6 +23,9 @@ pub fn seccomp(fd_in_file: RawFd, comm_in: RawFd, comm_out: RawFd) -> Result<()>
         Syscall::ioctl,
         &[
             Comparator::new(0, Cmp::Eq, 1, None),
+            #[cfg(target_env = "musl")]
+            Comparator::new(1, Cmp::Eq, libc::TCGETS as u64, None),
+            #[cfg(not(target_env = "musl"))]
             Comparator::new(1, Cmp::Eq, libc::TCGETS, None),
         ],
     )?;
@@ -32,6 +35,9 @@ pub fn seccomp(fd_in_file: RawFd, comm_in: RawFd, comm_out: RawFd) -> Result<()>
         Syscall::ioctl,
         &[
             Comparator::new(0, Cmp::Eq, 2, None),
+            #[cfg(target_env = "musl")]
+            Comparator::new(1, Cmp::Eq, libc::TCGETS as u64, None),
+            #[cfg(not(target_env = "musl"))]
             Comparator::new(1, Cmp::Eq, libc::TCGETS, None),
         ],
     )?;
@@ -41,6 +47,9 @@ pub fn seccomp(fd_in_file: RawFd, comm_in: RawFd, comm_out: RawFd) -> Result<()>
         Syscall::ioctl,
         &[
             Comparator::new(0, Cmp::Eq, 2, None),
+            #[cfg(target_env = "musl")]
+            Comparator::new(1, Cmp::Eq, libc::TIOCGWINSZ as u64, None),
+            #[cfg(not(target_env = "musl"))]
             Comparator::new(1, Cmp::Eq, libc::TIOCGWINSZ, None),
         ],
     )?;

diff --git a/usbsas-sandbox/src/imager.rs b/usbsas-sandbox/src/imager.rs
@@ -15,6 +15,9 @@ pub fn seccomp(fds_read: Vec<RawFd>, fds_write: Vec<RawFd>) -> Result<()> {
         Syscall::ioctl,
         &[
             Comparator::new(0, Cmp::Eq, 1, None),
+            #[cfg(target_env = "musl")]
+            Comparator::new(1, Cmp::Eq, libc::TCGETS as u64, None),
+            #[cfg(not(target_env = "musl"))]
             Comparator::new(1, Cmp::Eq, libc::TCGETS, None),
         ],
     )?;
@@ -24,6 +27,9 @@ pub fn seccomp(fds_read: Vec<RawFd>, fds_write: Vec<RawFd>) -> Result<()> {
         Syscall::ioctl,
         &[
             Comparator::new(0, Cmp::Eq, 2, None),
+            #[cfg(target_env = "musl")]
+            Comparator::new(1, Cmp::Eq, libc::TCGETS as u64, None),
+            #[cfg(not(target_env = "musl"))]
             Comparator::new(1, Cmp::Eq, libc::TCGETS, None),
         ],
     )?;
@@ -33,6 +39,9 @@ pub fn seccomp(fds_read: Vec<RawFd>, fds_write: Vec<RawFd>) -> Result<()> {
         Syscall::ioctl,
         &[
             Comparator::new(0, Cmp::Eq, 2, None),
+            #[cfg(target_env = "musl")]
+            Comparator::new(1, Cmp::Eq, libc::TIOCGWINSZ as u64, None),
+            #[cfg(not(target_env = "musl"))]
             Comparator::new(1, Cmp::Eq, libc::TIOCGWINSZ, None),
         ],
     )?;

diff --git a/usbsas-sandbox/src/seccomp.rs b/usbsas-sandbox/src/seccomp.rs
@@ -58,6 +58,9 @@ pub(crate) fn new_context_with_common_rules(
         Syscall::ioctl,
         &[
             Comparator::new(0, Cmp::Eq, 2, None),
+            #[cfg(target_env = "musl")]
+            Comparator::new(1, Cmp::Eq, libc::TCGETS as u64, None),
+            #[cfg(not(target_env = "musl"))]
             Comparator::new(1, Cmp::Eq, libc::TCGETS, None),
         ],
     )?;