summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2025-11-19 15:29:32 +0100
committerLinus Färnstrand <linus@mullvad.net>2025-11-20 13:55:30 +0100
commit5f8bd261aa1893775f90f4f3f2faa10ddfe9725e (patch)
tree8608aabfec1f39150dd5638c8339fd604934e17d
parent35f0c8981baa05fb0c4d7d718c25b11d60095fd9 (diff)
downloadmullvadvpn-5f8bd261aa1893775f90f4f3f2faa10ddfe9725e.tar.xz
mullvadvpn-5f8bd261aa1893775f90f4f3f2faa10ddfe9725e.zip
Fix clippy::borrow_as_ptr warnings on macOS
-rw-r--r--mullvad-daemon/src/macos.rs4
-rw-r--r--talpid-core/src/firewall/macos.rs4
-rw-r--r--talpid-core/src/split_tunnel/macos/bpf.rs2
-rw-r--r--talpid-macos/src/process.rs4
-rw-r--r--talpid-routing/src/unix/macos/routing_socket.rs2
5 files changed, 8 insertions, 8 deletions
diff --git a/mullvad-daemon/src/macos.rs b/mullvad-daemon/src/macos.rs
index cc92c7289d..66404d8fd3 100644
--- a/mullvad-daemon/src/macos.rs
+++ b/mullvad-daemon/src/macos.rs
@@ -18,7 +18,7 @@ pub fn bump_filehandle_limit() {
rlim_max: 0,
};
// SAFETY: `&mut limits` is a valid pointer parameter for the getrlimit syscall
- let status = unsafe { libc::getrlimit(libc::RLIMIT_NOFILE, &mut limits) };
+ let status = unsafe { libc::getrlimit(libc::RLIMIT_NOFILE, &raw mut limits) };
if status != 0 {
log::error!(
"Failed to get file handle limits: {}-{}",
@@ -36,7 +36,7 @@ pub fn bump_filehandle_limit() {
limits.rlim_cur = INCREASED_FILEHANDLE_LIMIT;
// SAFETY: `&limits` is a valid pointer parameter for the getrlimit syscall
- let status = unsafe { libc::setrlimit(libc::RLIMIT_NOFILE, &limits) };
+ let status = unsafe { libc::setrlimit(libc::RLIMIT_NOFILE, &raw const limits) };
if status != 0 {
log::error!(
"Failed to set file handle limit to {}: {}-{}",
diff --git a/talpid-core/src/firewall/macos.rs b/talpid-core/src/firewall/macos.rs
index 68c99a66a8..65e8041401 100644
--- a/talpid-core/src/firewall/macos.rs
+++ b/talpid-core/src/firewall/macos.rs
@@ -5,7 +5,7 @@ use std::ptr;
use std::sync::LazyLock;
use ipnetwork::IpNetwork;
-use libc::{c_int, sysctlbyname};
+use libc::{c_int, c_void, sysctlbyname};
use pfctl::{DropAction, FilterRuleAction, Ip, Uid};
use talpid_tunnel::TunnelMetadata;
use talpid_types::net::{
@@ -1032,7 +1032,7 @@ fn enable_forwarding_for_family(ipv4: bool) -> io::Result<()> {
option.as_ptr(),
ptr::null_mut(),
ptr::null_mut(),
- &mut val as *mut _ as _,
+ (&raw mut val).cast::<c_void>(),
std::mem::size_of_val(&val),
)
};
diff --git a/talpid-core/src/split_tunnel/macos/bpf.rs b/talpid-core/src/split_tunnel/macos/bpf.rs
index d146d38c5a..f2d1ff5d66 100644
--- a/talpid-core/src/split_tunnel/macos/bpf.rs
+++ b/talpid-core/src/split_tunnel/macos/bpf.rs
@@ -136,7 +136,7 @@ impl Bpf {
unsafe {
std::ptr::copy_nonoverlapping(
name_bytes.as_ptr(),
- &mut ifr.ifr_name as *mut _ as *mut _,
+ ifr.ifr_name.as_mut_ptr().cast::<u8>(),
name_bytes.len(),
)
};
diff --git a/talpid-macos/src/process.rs b/talpid-macos/src/process.rs
index c547e8d10c..dfdc4eef7a 100644
--- a/talpid-macos/src/process.rs
+++ b/talpid-macos/src/process.rs
@@ -125,7 +125,7 @@ pub fn get_file_desc_vnode_path(pid: pid_t, info: &proc_fdinfo) -> io::Result<CS
pid,
info.proc_fd,
PROC_PIDFDVNODEPATHINFO as _,
- &mut vnode as *mut _ as _,
+ (&raw mut vnode).cast::<c_void>(),
std::mem::size_of_val(&vnode) as _,
)
};
@@ -149,7 +149,7 @@ pub fn process_bsdinfo(pid: pid_t) -> io::Result<proc_bsdinfo> {
pid,
PROC_PIDTBSDINFO as _,
0,
- &mut info as *mut proc_bsdinfo as *mut c_void,
+ (&raw mut info).cast::<c_void>(),
std::mem::size_of_val(&info) as _,
)
};
diff --git a/talpid-routing/src/unix/macos/routing_socket.rs b/talpid-routing/src/unix/macos/routing_socket.rs
index 0028ad8e3b..92907eb0ef 100644
--- a/talpid-routing/src/unix/macos/routing_socket.rs
+++ b/talpid-routing/src/unix/macos/routing_socket.rs
@@ -134,7 +134,7 @@ impl RoutingSocket {
// SAFETY: `msg_buffer` is guaranteed to be at least as large as `rt_msghdr`.
unsafe {
std::ptr::copy_nonoverlapping(
- &header as *const _ as *const u8,
+ (&raw const header).cast::<u8>(),
msg_buffer.as_mut_ptr(),
size_of::<libc::rt_msghdr>(),
);