commit 8c0d2d2bc557ced86650ab48ab92cf58840efce8
author Elliott Hughes <enh@google.com> Wed Jul 01 14:56:07 2015 -0500
committer Rob Landley <rob@landley.net> Wed Jul 01 14:56:07 2015 -0500
tree b5781eb790c0c54198b9bea417be2886c46091fa
parent 56217bb175cdf9506b9b7970edd313c1fef8e122

Improve -Z error reporting.

The most likely reason for setfscreatecon to fail is that you don't have permission, and that's reported by the write return EACCES. There isn't really a "bad" context; they're just strings.

Before:

  $ adb shell mkdir -Z x y
  mkdir: bad -Z 'x'

After:

  $ adb shell mkdir -Z x y
  mkdir: -Z 'x' failed: Permission denied

Other than this, the ToT mkdir works fine with SELinux.

toys/lsb/mknod.c

diff --git a/toys/lsb/mknod.c b/toys/lsb/mknod.c
index d6cd65c..39073fa 100644
--- a/toys/lsb/mknod.c
+++ b/toys/lsb/mknod.c
@@ -52,7 +52,7 @@
 
   if (toys.optflags & FLAG_Z)
     if (-1 == lsm_set_create(TT.arg_context))
-      error_exit("bad -Z '%s'", TT.arg_context);
+      perror_exit("-Z '%s' failed", TT.arg_context);
   if (mknod(*toys.optargs, mode|modes[type], makedev(major, minor)))
     perror_exit("%s", *toys.optargs);
 }

toys/posix/mkdir.c

diff --git a/toys/posix/mkdir.c b/toys/posix/mkdir.c
index 438e38e..95bdf33 100644
--- a/toys/posix/mkdir.c
+++ b/toys/posix/mkdir.c
@@ -43,7 +43,7 @@
 
   if (CFG_MKDIR_Z && (toys.optflags&FLAG_Z))
     if (0>lsm_set_create(TT.arg_context))
-      error_exit("bad -Z '%s'", TT.arg_context);
+      perror_exit("-Z '%s' failed", TT.arg_context);
 
   if (TT.arg_mode) mode = string_to_mode(TT.arg_mode, 0777);
 

toys/posix/mkfifo.c

diff --git a/toys/posix/mkfifo.c b/toys/posix/mkfifo.c
index 7bc43cc..9aa3a3a 100644
--- a/toys/posix/mkfifo.c
+++ b/toys/posix/mkfifo.c
@@ -43,7 +43,7 @@
 
   if (CFG_MKFIFO_Z && (toys.optflags&FLAG_Z))
     if (0>lsm_set_create(TT.Z))
-      error_exit("bad -Z '%s'", TT.Z);
+      perror_exit("-Z '%s' failed", TT.Z);
 
   for (s = toys.optargs; *s; s++)
     if (mknod(*s, S_IFIFO | TT.mode, 0) < 0) perror_msg("%s", *s);