main: fix check for writeable /proc

fix the check for writeable /proc to use statfs instead of statvfs, and use the unitialized statvfs structure to check for the writeable bit. Closes: #397 Signed-off-by: Giuseppe Scrivano <[email protected]>
containers · Jun 7, 2023 · 06f8a69 · 06f8a69
1 parent bcea6c9
commit 06f8a69
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/main.c b/main.c
@@ -296,25 +296,23 @@ inode_to_node (struct ovl_data *lo, ino_t n)
 static void
 check_writeable_proc ()
 {
-  struct statvfs svfs;
-  struct statfs sfs;
-
+  struct statfs svfs;
   int ret;
 
-  ret = statfs ("/proc", &sfs);
+  ret = statfs ("/proc", &svfs);
   if (ret < 0)
     {
       fprintf (stderr, "error stating /proc: %m\n");
       return;
     }
 
-  if (sfs.f_type != PROC_SUPER_MAGIC)
+  if (svfs.f_type != PROC_SUPER_MAGIC)
     {
-      fprintf (stderr, "invalid file system type found on /proc: %m\n");
+      fprintf (stderr, "invalid file system type found on /proc: %d, expected %d\n", svfs.f_fsid, PROC_SUPER_MAGIC);
       return;
     }
 
-  if (svfs.f_flag & ST_RDONLY)
+  if (svfs.f_flags & ST_RDONLY)
     {
       fprintf (stderr, "/proc seems to be mounted as readonly, it can lead to unexpected failures");
       return;