Add unsetting test

Author: tiif

src/shims/unix/unnamed_socket.rs

@@ -7,6 +7,8 @@ use std::collections::VecDeque;
 use std::io;
 use std::io::ErrorKind;
 
+use libc::O_NONBLOCK;
+
 use crate::concurrency::VClock;
 use crate::shims::files::{
     EvalContextExt as _, FileDescription, FileDescriptionRef, WeakFileDescriptionRef,
@@ -152,14 +154,25 @@ impl FileDescription for AnonSocket {
 
     fn set_flags<'tcx>(
         &self,
-        flag: i32,
+        mut flag: i32,
         ecx: &mut MiriInterpCx<'tcx>,
     ) -> InterpResult<'tcx, Scalar> {
         // FIXME: File access mode and file creation flags should be ignored.
-        // TODO: support flag unset
-        if flag == ecx.eval_libc_i32("O_NONBLOCK") {
+
+        let o_nonblock = ecx.eval_libc_i32("O_NONBLOCK");
+
+        // TODO: this is kind of bad and subtle, add a comment in the pr
+        if flag & o_nonblock == o_nonblock {
+            // If there is O_NONBLOCK flag
             self.is_nonblock.set(true);
+            flag &= !O_NONBLOCK;
         } else {
+            // If there is no O_NONBLOCK flag
+            self.is_nonblock.set(false);
+        }
+
+        // Fail if there is unsupported flag.
+        if flag & o_nonblock != 0 {
             throw_unsup_format!("fcntl: only O_NONBLOCK is supported for F_SETFL")
         }
 

tests/pass-dep/libc/libc-fs-with-isolation.rs

@@ -57,11 +57,19 @@ fn test_socketpair_setfl_getfl() {
     let res = unsafe { libc::fcntl(fds[0], libc::F_GETFL) };
     assert_eq!(res, new_flag);
 
-    // THe other side remains unchanged.
+    // Test unset flag
+    let res = unsafe { libc::fcntl(fds[0], libc::F_SETFL, 0) };
+    assert_eq!(res, 0);
+    let new_flag = libc::O_RDWR;
+    let res = unsafe { libc::fcntl(fds[0], libc::F_GETFL) };
+    assert_eq!(res, new_flag);
+
+    // The other side remains unchanged.
     let res = unsafe { libc::fcntl(fds[1], libc::F_GETFL) };
     assert_eq!(res, libc::O_RDWR);
 }
 
+/// Basic test for pipe fcntl's F_SETFL and F_GETFL flag.
 fn test_pipe_setfl_getfl() {
     let mut fds = [-1, -1];
     let res = unsafe { libc::pipe(fds.as_mut_ptr()) };
@@ -82,6 +90,13 @@ fn test_pipe_setfl_getfl() {
     let res = unsafe { libc::fcntl(fds[0], libc::F_GETFL) };
     assert_eq!(res, new_flag);
 
+    // Test unset flag.
+    let res = unsafe { libc::fcntl(fds[0], libc::F_SETFL, 0) };
+    assert_eq!(res, 0);
+    let new_flag = libc::O_RDONLY;
+    let res = unsafe { libc::fcntl(fds[0], libc::F_GETFL) };
+    assert_eq!(res, new_flag);
+
     // THe other side remains unchanged.
     let res = unsafe { libc::fcntl(fds[1], libc::F_GETFL) };
     assert_eq!(res, libc::O_WRONLY);