File 0106-Monitor-don-t-use-default-modes-when-creat... of Package mdadm

Overview Repositories Revisions Requests Users Attributes Meta

File 0106-Monitor-don-t-use-default-modes-when-creating-a-file.patch of Package mdadm (Revision 8eb6ee1f81cbc7f704b2340ffcfacbe3)

Currently displaying revision 8eb6ee1f81cbc7f704b2340ffcfacbe3 , Show latest

From ca4b156b2059ee00a9143313267ee4a098967d76 Mon Sep 17 00:00:00 2001
From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
Date: Tue, 24 Nov 2020 16:41:01 +0100
Subject: [PATCH 12/17] Monitor: don't use default modes when creating a file
Git-commit: ca4b156b2059ee00a9143313267ee4a098967d76
References: jsc#SLE-13700

Replace fopen() calls by open() with creation mode directly specified.
This fixes the potential security issue. Use octal values instead masks.

Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
Signed-off-by: Coly Li <colyli@suse.de>

---
 Monitor.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/Monitor.c b/Monitor.c
index 7fd4808..a82e99d 100644
--- a/Monitor.c
+++ b/Monitor.c
@@ -305,8 +305,11 @@ static int make_daemon(char *pidfile)
 		if (!pidfile)
 			printf("%d\n", pid);
 		else {
-			FILE *pid_file;
-			pid_file=fopen(pidfile, "w");
+			FILE *pid_file = NULL;
+			int fd = open(pidfile, O_WRONLY | O_CREAT | O_TRUNC,
+				      0644);
+			if (fd >= 0)
+				pid_file = fdopen(fd, "w");
 			if (!pid_file)
 				perror("cannot create pid file");
 			else {
@@ -368,13 +371,17 @@ static void write_autorebuild_pid()
 {
 	char path[PATH_MAX];
 	int pid;
-	FILE *fp;
+	FILE *fp = NULL;
 	sprintf(path, "%s/autorebuild.pid", MDMON_DIR);
 
-	if (mkdir(MDMON_DIR, S_IRWXU) < 0 && errno != EEXIST) {
+	if (mkdir(MDMON_DIR, 0700) < 0 && errno != EEXIST) {
 		pr_err("Can't create autorebuild.pid file\n");
 	} else {
-		fp = fopen(path, "w");
+		int fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0700);
+
+		if (fd >= 0)
+			fp = fdopen(fd, "w");
+
 		if (!fp)
 			pr_err("Can't create autorebuild.pid file\n");
 		else {
-- 
2.26.2

Places

File 0106-Monitor-don-t-use-default-modes-when-creating-a-file.patch of Package mdadm (Revision 8eb6ee1f81cbc7f704b2340ffcfacbe3)

Places