From: Mike Yuan <me@yhndnzj.com>
Date: Sat, 20 Apr 2024 19:02:38 +0000 (+0800)
Subject: mountpoint-util: add missing assertions, make mount_fd static
X-Git-Tag: v257-rc1~1193^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88873231c87411f7513428cb4237e4877249c4bf;p=thirdparty%2Fsystemd.git

mountpoint-util: add missing assertions, make mount_fd static
---

diff --git a/src/basic/mountpoint-util.c b/src/basic/mountpoint-util.c
index 66fa35b6309..03e56f6cabd 100644
--- a/src/basic/mountpoint-util.c
+++ b/src/basic/mountpoint-util.c
@@ -596,11 +596,14 @@ int dev_is_devtmpfs(void) {
         return false;
 }
 
-int mount_fd(const char *source,
-             int target_fd,
-             const char *filesystemtype,
-             unsigned long mountflags,
-             const void *data) {
+static int mount_fd(
+                const char *source,
+                int target_fd,
+                const char *filesystemtype,
+                unsigned long mountflags,
+                const void *data) {
+
+        assert(target_fd >= 0);
 
         if (mount(source, FORMAT_PROC_FD_PATH(target_fd), filesystemtype, mountflags, data) < 0) {
                 if (errno != ENOENT)
@@ -626,6 +629,8 @@ int mount_nofollow(
 
         _cleanup_close_ int fd = -EBADF;
 
+        assert(target);
+
         /* In almost all cases we want to manipulate the mount table without following symlinks, hence
          * mount_nofollow() is usually the way to go. The only exceptions are environments where /proc/ is
          * not available yet, since we need /proc/self/fd/ for this logic to work. i.e. during the early
diff --git a/src/basic/mountpoint-util.h b/src/basic/mountpoint-util.h
index d7c6251aff7..e5f21780f8f 100644
--- a/src/basic/mountpoint-util.h
+++ b/src/basic/mountpoint-util.h
@@ -63,8 +63,12 @@ const char* fstype_norecovery_option(const char *fstype);
 
 int dev_is_devtmpfs(void);
 
-int mount_fd(const char *source, int target_fd, const char *filesystemtype, unsigned long mountflags, const void *data);
-int mount_nofollow(const char *source, const char *target, const char *filesystemtype, unsigned long mountflags, const void *data);
+int mount_nofollow(
+                const char *source,
+                const char *target,
+                const char *filesystemtype,
+                unsigned long mountflags,
+                const void *data);
 
 const char *mount_propagation_flag_to_string(unsigned long flags);
 int mount_propagation_flag_from_string(const char *name, unsigned long *ret);