commit b32615b20da919d77ec4742895d00101850c4a3b
author Nick Kralevich <nnk@google.com> Tue Nov 24 02:58:14 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Nov 24 02:58:14 2015 +0000
tree a35d524f6e3413140ec6cc0c86dca023abeb2bdc
parent 5b04eec8dc06fe72706d6d564367d24dc4c53a23
parent 19298fe616b6d16eb05bb6b883f3f6f8df744f8b

Merge "init: Don\'t ignore setsockcreatecon errors" am: 07cb69415a
am: 17c0edc6ee

* commit '17c0edc6eea2470e628c6c209bc66f02c3ed2ec5':
  init: Don't ignore setsockcreatecon errors

init/util.cpp

diff --git a/init/util.cpp b/init/util.cpp
index b316d6e..c7d0314 100644
--- a/init/util.cpp
+++ b/init/util.cpp
@@ -105,8 +105,12 @@
     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) {