From bf7afbc1c3fbe3349d59a6c3cbfcc130f9b20792 Mon Sep 17 00:00:00 2001
From: Leon Chan <chenwei26@huawei.com>
Date: Thu, 16 Sep 2021 16:18:02 +0800
Subject: [PATCH] fix: same file mode for procfs files

close: #I4ACTC

Signed-off-by: Leon Chan <chenwei26@huawei.com>
---
 fs/proc/include/proc_fs.h    | 3 +++
 fs/proc/os_adapt/proc_init.c | 2 +-
 fs/proc/os_adapt/proc_vfs.c  | 2 --
 fs/proc/src/proc_file.c      | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/fs/proc/include/proc_fs.h b/fs/proc/include/proc_fs.h
index ed1f6fcb..9e25bd41 100644
--- a/fs/proc/include/proc_fs.h
+++ b/fs/proc/include/proc_fs.h
@@ -53,6 +53,9 @@ extern "C" {
 typedef unsigned short fmode_t;
 #define PROC_ERROR (-1)
 
+/* Default file mode for procfs */
+#define PROCFS_DEFAULT_MODE 0555
+
 /* 64bit hashes as llseek() offset (for directories) */
 #define FMODE_64BITHASH   ((fmode_t)0x400)
 /* 32bit hashes as llseek() offset (for directories) */
diff --git a/fs/proc/os_adapt/proc_init.c b/fs/proc/os_adapt/proc_init.c
index f44627f8..4dfdebfd 100644
--- a/fs/proc/os_adapt/proc_init.c
+++ b/fs/proc/os_adapt/proc_init.c
@@ -45,7 +45,7 @@ void ProcFsInit(void)
 {
     int ret;
 
-    ret = mkdir(PROCFS_MOUNT_POINT, 0);
+    ret = mkdir(PROCFS_MOUNT_POINT, PROCFS_DEFAULT_MODE);
     if (ret < 0) {
         PRINT_ERR("failed to mkdir %s, errno = %d\n", PROCFS_MOUNT_POINT, get_errno());
         return;
diff --git a/fs/proc/os_adapt/proc_vfs.c b/fs/proc/os_adapt/proc_vfs.c
index 7cabbaf9..3876967c 100644
--- a/fs/proc/os_adapt/proc_vfs.c
+++ b/fs/proc/os_adapt/proc_vfs.c
@@ -41,8 +41,6 @@
 #include "los_tables.h"
 #include "internal.h"
 
-#define PROCFS_DEFAULT_MODE 0555
-
 #ifdef LOSCFG_FS_PROC
 static struct VnodeOps g_procfsVops;
 static struct file_operations_vfs g_procfsFops;
diff --git a/fs/proc/src/proc_file.c b/fs/proc/src/proc_file.c
index 331be79c..9eebcd46 100644
--- a/fs/proc/src/proc_file.c
+++ b/fs/proc/src/proc_file.c
@@ -49,7 +49,7 @@ static struct ProcFile g_procPf = {
 
 static struct ProcDirEntry g_procRootDirEntry = {
     .nameLen     = 5,
-    .mode        = S_IFDIR | S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH,
+    .mode        = S_IFDIR | PROCFS_DEFAULT_MODE,
     .count       = ATOMIC_INIT(1),
     .procFileOps = NULL,
     .parent      = &g_procRootDirEntry,
-- 
GitLab