From e64f78867bcb052eb74543d313f8a626e80990b4 Mon Sep 17 00:00:00 2001 From: Alex Saveau Date: Fri, 6 Jan 2023 13:32:51 -0800 Subject: [PATCH] Rename capabilities functions to be consistent Signed-off-by: Alex Saveau --- src/thread/prctl.rs | 11 ++++------- tests/thread/prctl.rs | 8 ++++---- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/thread/prctl.rs b/src/thread/prctl.rs index a2191f7c3..27b55f434 100644 --- a/src/thread/prctl.rs +++ b/src/thread/prctl.rs @@ -387,7 +387,7 @@ pub enum Capability { /// /// [`prctl(PR_CAPBSET_READ,...)`]: https://man7.org/linux/man-pages/man2/prctl.2.html #[inline] -pub fn is_in_capability_bounding_set(capability: Capability) -> io::Result { +pub fn capability_is_in_bounding_set(capability: Capability) -> io::Result { unsafe { prctl_2args(PR_CAPBSET_READ, capability as usize as *mut _) }.map(|r| r != 0) } @@ -401,7 +401,7 @@ const PR_CAPBSET_DROP: c_int = 24; /// /// [`prctl(PR_CAPBSET_DROP,...)`]: https://man7.org/linux/man-pages/man2/prctl.2.html #[inline] -pub fn remove_capability_from_capability_bounding_set(capability: Capability) -> io::Result<()> { +pub fn remove_capability_from_bounding_set(capability: Capability) -> io::Result<()> { unsafe { prctl_2args(PR_CAPBSET_DROP, capability as usize as *mut _) }.map(|_r| ()) } @@ -588,7 +588,7 @@ const PR_CAP_AMBIENT_IS_SET: usize = 1; /// /// [`prctl(PR_CAP_AMBIENT,PR_CAP_AMBIENT_IS_SET,...)`]: https://man7.org/linux/man-pages/man2/prctl.2.html #[inline] -pub fn capability_is_in_ambient_capability_set(capability: Capability) -> io::Result { +pub fn capability_is_in_ambient_set(capability: Capability) -> io::Result { let cap = capability as usize as *mut _; unsafe { prctl_3args(PR_CAP_AMBIENT, PR_CAP_AMBIENT_IS_SET as *mut _, cap) }.map(|r| r != 0) } @@ -616,10 +616,7 @@ const PR_CAP_AMBIENT_LOWER: usize = 3; /// /// [`prctl(PR_CAP_AMBIENT,...)`]: https://man7.org/linux/man-pages/man2/prctl.2.html #[inline] -pub fn configure_capability_in_ambient_capability_set( - capability: Capability, - enable: bool, -) -> io::Result<()> { +pub fn configure_capability_in_ambient_set(capability: Capability, enable: bool) -> io::Result<()> { let sub_operation = if enable { PR_CAP_AMBIENT_RAISE } else { diff --git a/tests/thread/prctl.rs b/tests/thread/prctl.rs index 141451461..1af6f6c38 100644 --- a/tests/thread/prctl.rs +++ b/tests/thread/prctl.rs @@ -14,8 +14,8 @@ fn test_name() { } #[test] -fn test_is_in_capability_bounding_set() { - dbg!(is_in_capability_bounding_set(Capability::ChangeOwnership).unwrap()); +fn test_capability_is_in_bounding_set() { + dbg!(capability_is_in_bounding_set(Capability::ChangeOwnership).unwrap()); } #[test] @@ -34,8 +34,8 @@ fn test_no_new_privs() { } #[test] -fn test_capability_is_in_ambient_capability_set() { - dbg!(capability_is_in_ambient_capability_set(Capability::ChangeOwnership).unwrap()); +fn test_capability_is_in_ambient_set() { + dbg!(capability_is_in_ambient_set(Capability::ChangeOwnership).unwrap()); } #[cfg(target_arch = "aarch64")]