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

am: 17c0edc6ee

* commit '17c0edc6eea2470e628c6c209bc66f02c3ed2ec5':
  init: Don't ignore setsockcreatecon errors
This commit is contained in:
Nick Kralevich 2015-11-24 02:58:14 +00:00 committed by android-build-merger
commit 42bf3e893e
1 changed files with 6 additions and 2 deletions

View File

@ -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) {