commit 0dda6d8f285760b12fb2696e9f7b8975702ec5cb
author Mike Frysinger <vapier@chromium.org> Tue Nov 24 23:09:06 2020 -0500
committer Commit Bot <commit-bot@chromium.org> Wed Nov 25 23:48:49 2020 +0000
tree d69eb10c4a65ca386a5bbb961dfe31b246b5fb91
parent a6949cbb41e970033d8e2314331c1ed00b3fb9bb

CHROMIUM: fix /run/lock permissions

Since upstart runs with umask(022), the mkdir(/run/lock, 1777) ends
up being 1755 which is not what we want.  Use chmod to force it.

BUG=chromium:1063545
TEST=CQ passes

Change-Id: Iac4551e2c38ce73b7d0e4675a1d932fe86b7bca8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/upstart/+/2559164
Reviewed-by: Allen Webb <allenwebb@google.com>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

init/main.c

diff --git a/init/main.c b/init/main.c
index f354704..87f7752 100644
--- a/init/main.c
+++ b/init/main.c
@@ -263,7 +263,8 @@
 		nih_free (err);
 	}
 
-	if (mkdir ("/run/lock", 01777) < 0 && errno != EEXIST) {
+	if ((mkdir ("/run/lock", 01777) < 0 && errno != EEXIST) ||
+	    chmod ("/run/lock", 01777) < 0) {
 		NihError *err;
 
 		err = nih_error_get ();