From ec5552fa19ca1666c6dccd3c14d735f2bcf2e4a9 Mon Sep 17 00:00:00 2001 From: Steve Lau Date: Mon, 24 Mar 2025 09:31:24 +0800 Subject: [PATCH 1/2] chore: clippy cleanup ptr_eq --- src/sys/mman.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sys/mman.rs b/src/sys/mman.rs index ac142316b1..8ffdde2787 100644 --- a/src/sys/mman.rs +++ b/src/sys/mman.rs @@ -439,7 +439,7 @@ pub unsafe fn mmap( libc::mmap(ptr, length.into(), prot.bits(), flags.bits(), fd, offset) }; - if ret == libc::MAP_FAILED { + if std::ptr::eq(ret, libc::MAP_FAILED) { Err(Errno::last()) } else { // SAFETY: `libc::mmap` returns a valid non-null pointer or `libc::MAP_FAILED`, thus `ret` @@ -471,7 +471,7 @@ pub unsafe fn mmap_anonymous( libc::mmap(ptr, length.into(), prot.bits(), flags.bits(), -1, 0) }; - if ret == libc::MAP_FAILED { + if std::ptr::eq(ret, libc::MAP_FAILED) { Err(Errno::last()) } else { // SAFETY: `libc::mmap` returns a valid non-null pointer or `libc::MAP_FAILED`, thus `ret` @@ -520,7 +520,7 @@ pub unsafe fn mremap( ) }; - if ret == libc::MAP_FAILED { + if std::ptr::eq(ret, libc::MAP_FAILED) { Err(Errno::last()) } else { // SAFETY: `libc::mremap` returns a valid non-null pointer or `libc::MAP_FAILED`, thus `ret` From 01e2349845b0f5727c514c0d0cb0d64eed3fb9ec Mon Sep 17 00:00:00 2001 From: Steve Lau Date: Mon, 24 Mar 2025 09:35:27 +0800 Subject: [PATCH 2/2] chore: allow deprecated SOCK_PACKET --- test/sys/test_sockopt.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/sys/test_sockopt.rs b/test/sys/test_sockopt.rs index 42697ffa24..3ffc89069a 100644 --- a/test/sys/test_sockopt.rs +++ b/test/sys/test_sockopt.rs @@ -241,6 +241,8 @@ fn test_so_type_unknown() { use nix::errno::Errno; require_capability!("test_so_type", CAP_NET_RAW); + // SOCK_PACKET is deprecated, but since it is used for testing here, we allow it + #[allow(deprecated)] let raw_fd = unsafe { libc::socket(libc::AF_PACKET, libc::SOCK_PACKET, 0) }; assert!(raw_fd >= 0, "Error opening socket: {}", nix::Error::last()); let sockfd = unsafe { OwnedFd::from_raw_fd(raw_fd) };