Merge "init: Don't ignore setsockcreatecon errors"

2015-11-24 01:18:12 +00:00 · 2015-11-24 01:18:12 +00:00 · 07cb69415a
parent ddf41f1ad0 83ccb1c76b
commit 07cb69415a
1 changed files with 6 additions and 2 deletions
--- a/init/util.cpp
+++ b/init/util.cpp
@ -105,8 +105,12 @@ int create_socket(const char *name, int type, mode_t perm, uid_t uid,
    int fd, ret;
    char *filecon;

-    if (socketcon)
-        setsockcreatecon(socketcon);
+    if (socketcon) {
+        if (setsockcreatecon(socketcon) == -1) {
+            ERROR("setsockcreatecon(\"%s\") failed: %s\n", socketcon, strerror(errno));
+            return -1;
+        }
+    }

    fd = socket(PF_UNIX, type, 0);
    if (fd < 0) {