From 823b222af9eee2224c34e8ca5c2b1567f17082b0 Mon Sep 17 00:00:00 2001
From: Masamichi Takagi <masamichi.takagi@riken.jp>
Date: Tue, 3 Oct 2017 05:26:44 +0900
Subject: [PATCH] mcreboot: Change umask for /proc and /sys files

---
 arch/x86/tools/mcoverlay-create-smp-x86.sh.in | 6 +++++-
 arch/x86/tools/mcreboot-smp-x86.sh.in         | 7 +++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/arch/x86/tools/mcoverlay-create-smp-x86.sh.in b/arch/x86/tools/mcoverlay-create-smp-x86.sh.in
index 254047b3..d4dfba7c 100644
--- a/arch/x86/tools/mcoverlay-create-smp-x86.sh.in
+++ b/arch/x86/tools/mcoverlay-create-smp-x86.sh.in
@@ -35,6 +35,7 @@ error_exit() {
 		;&
 	tmp_mcos_created)
 		if [ "$enable_mcoverlay" == "yes" ]; then
+		    umask $umask_old
 			rm -rf /tmp/mcos
 		fi
 		;&
@@ -45,9 +46,12 @@ error_exit() {
 
 	exit 1
 }
-
 fi
 
+# Change umask for /proc and /sys files 
+umask_dec=$(( 8#${umask_old} & 8#0002 ))
+umask 0`printf "%o" ${umask_dec}`
+
 if [ ! -e /tmp/mcos ]; then 
     mkdir -p /tmp/mcos; 
 fi
diff --git a/arch/x86/tools/mcreboot-smp-x86.sh.in b/arch/x86/tools/mcreboot-smp-x86.sh.in
index 02d8bbc9..c7f91064 100644
--- a/arch/x86/tools/mcreboot-smp-x86.sh.in
+++ b/arch/x86/tools/mcreboot-smp-x86.sh.in
@@ -43,6 +43,7 @@ fi
 
 turbo=""
 ihk_irq=""
+umask_old=`umask`
 
 while getopts :tk:c:m:o:f:r:q:i:d: OPT
 do
@@ -114,6 +115,7 @@ error_exit() {
 		;&
 	tmp_mcos_created)
 		if [ "$enable_mcoverlay" == "yes" ]; then
+		    umask $umask_old
 			rm -rf /tmp/mcos
 		fi
 		;&
@@ -421,3 +423,8 @@ if [ "${irqbalance_used}" == "yes" ]; then
 	fi
 #    echo cpus=$cpus ncpus=$ncpus banirq=$banirq
 fi
+
+# Restore umask
+umask ${umask_old}
+
+exit 0