Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SignalFd::set_mask closes the signal file descriptor #2116

Closed
DJMcNab opened this issue Aug 28, 2023 · 0 comments · Fixed by #2141
Closed

SignalFd::set_mask closes the signal file descriptor #2116

DJMcNab opened this issue Aug 28, 2023 · 0 comments · Fixed by #2141

Comments

@DJMcNab
Copy link

DJMcNab commented Aug 28, 2023

nix/src/sys/signalfd.rs

Lines 103 to 105 in b2e45a9

pub fn set_mask(&mut self, mask: &SigSet) -> Result<()> {
_signalfd(Some(self.0.as_fd()), mask, SfdFlags::empty()).map(drop)
}

This is because _signalfd returns an OwnedFd as of #1874 (cc @JonathanWoollett-Light ):

fn _signalfd<F: AsFd>(fd: Option<F>, mask: &SigSet, flags: SfdFlags) -> Result<OwnedFd> {

This has caused issues in Smithay/calloop, and required backing out of the nix 0.27 update (+ #2112, of course).

This can be worked around in user code by using the newly-deprecated signalfd function, so it's not too bad:

-        file.set_mask(&mask)?;
+        // The nix crate is currently broken. We would like to use:
+        // file.set_mask(&mask)?;
+        // but this closes the file descriptor
+        #[allow(deprecated)]
+        signalfd::signalfd(Some(file.as_fd()), &mask, SfdFlags::empty())
+            .map(std::mem::forget)?;
asomers added a commit to asomers/nix that referenced this issue Sep 30, 2023
In 0.27.0 it inadvertently closed the file descriptor, leaving the
SignalFd object accessing a stale file descriptor.

Fixes nix-rust#2116
asomers added a commit to asomers/nix that referenced this issue Oct 1, 2023
In 0.27.0 it inadvertently closed the file descriptor, leaving the
SignalFd object accessing a stale file descriptor.

Fixes nix-rust#2116
asomers added a commit to asomers/nix that referenced this issue Oct 1, 2023
In 0.27.0 it inadvertently closed the file descriptor, leaving the
SignalFd object accessing a stale file descriptor.

Fixes nix-rust#2116
github-merge-queue bot pushed a commit that referenced this issue Oct 2, 2023
In 0.27.0 it inadvertently closed the file descriptor, leaving the
SignalFd object accessing a stale file descriptor.

Fixes #2116
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

1 participant