|
 |
3c4af5 |
From ca4b156b2059ee00a9143313267ee4a098967d76 Mon Sep 17 00:00:00 2001
|
|
|
3c4af5 |
From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
|
|
|
3c4af5 |
Date: Tue, 24 Nov 2020 16:41:01 +0100
|
|
|
3c4af5 |
Subject: [PATCH 101/108] Monitor: don't use default modes when creating a file
|
|
|
3c4af5 |
|
|
|
3c4af5 |
Replace fopen() calls by open() with creation mode directly specified.
|
|
|
3c4af5 |
This fixes the potential security issue. Use octal values instead masks.
|
|
|
3c4af5 |
|
|
|
3c4af5 |
Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
|
|
|
3c4af5 |
---
|
|
|
3c4af5 |
Monitor.c | 17 ++++++++++++-----
|
|
|
3c4af5 |
1 file changed, 12 insertions(+), 5 deletions(-)
|
|
|
3c4af5 |
|
|
|
3c4af5 |
diff --git a/Monitor.c b/Monitor.c
|
|
|
3c4af5 |
index 7fd4808..a82e99d 100644
|
|
|
3c4af5 |
--- a/Monitor.c
|
|
|
3c4af5 |
+++ b/Monitor.c
|
|
|
3c4af5 |
@@ -305,8 +305,11 @@ static int make_daemon(char *pidfile)
|
|
|
3c4af5 |
if (!pidfile)
|
|
|
3c4af5 |
printf("%d\n", pid);
|
|
|
3c4af5 |
else {
|
|
|
3c4af5 |
- FILE *pid_file;
|
|
|
3c4af5 |
- pid_file=fopen(pidfile, "w");
|
|
|
3c4af5 |
+ FILE *pid_file = NULL;
|
|
|
3c4af5 |
+ int fd = open(pidfile, O_WRONLY | O_CREAT | O_TRUNC,
|
|
|
3c4af5 |
+ 0644);
|
|
|
3c4af5 |
+ if (fd >= 0)
|
|
|
3c4af5 |
+ pid_file = fdopen(fd, "w");
|
|
|
3c4af5 |
if (!pid_file)
|
|
|
3c4af5 |
perror("cannot create pid file");
|
|
|
3c4af5 |
else {
|
|
|
3c4af5 |
@@ -368,13 +371,17 @@ static void write_autorebuild_pid()
|
|
|
3c4af5 |
{
|
|
|
3c4af5 |
char path[PATH_MAX];
|
|
|
3c4af5 |
int pid;
|
|
|
3c4af5 |
- FILE *fp;
|
|
|
3c4af5 |
+ FILE *fp = NULL;
|
|
|
3c4af5 |
sprintf(path, "%s/autorebuild.pid", MDMON_DIR);
|
|
|
3c4af5 |
|
|
|
3c4af5 |
- if (mkdir(MDMON_DIR, S_IRWXU) < 0 && errno != EEXIST) {
|
|
|
3c4af5 |
+ if (mkdir(MDMON_DIR, 0700) < 0 && errno != EEXIST) {
|
|
|
3c4af5 |
pr_err("Can't create autorebuild.pid file\n");
|
|
|
3c4af5 |
} else {
|
|
|
3c4af5 |
- fp = fopen(path, "w");
|
|
|
3c4af5 |
+ int fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0700);
|
|
|
3c4af5 |
+
|
|
|
3c4af5 |
+ if (fd >= 0)
|
|
|
3c4af5 |
+ fp = fdopen(fd, "w");
|
|
|
3c4af5 |
+
|
|
|
3c4af5 |
if (!fp)
|
|
|
3c4af5 |
pr_err("Can't create autorebuild.pid file\n");
|
|
|
3c4af5 |
else {
|
|
|
3c4af5 |
--
|
|
|
3c4af5 |
2.7.5
|
|
|
3c4af5 |
|