commit b057fe93391f604a9843e4989f51986822235d59
author Benoit Goby <benoit@android.com> Tue Aug 14 17:38:58 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 14 17:38:58 2012 -0700
tree 1a7a0058cbb0148fa2b8fd5dbf718ecf08050876
parent a52b0192070b5c1c2f926a03797f5f1c77f33349
parent db58849a95b43b164506604c81b685c5050b8a63

am db58849a: am 5c8574b5: init: Fix mkdir command when using ISUID or ISGID bit

* commit 'db58849a95b43b164506604c81b685c5050b8a63':
  init: Fix mkdir command when using ISUID or ISGID bit

init/builtins.c

diff --git a/init/builtins.c b/init/builtins.c
index da41b89..bb963c1 100644
--- a/init/builtins.c
+++ b/init/builtins.c
@@ -322,6 +322,14 @@
         if (_chown(args[1], uid, gid) < 0) {
             return -errno;
         }
+
+        /* chown may have cleared S_ISUID and S_ISGID, chmod again */
+        if (mode & (S_ISUID | S_ISGID)) {
+            ret = _chmod(args[1], mode);
+            if (ret == -1) {
+                return -errno;
+            }
+        }
     }
 
     return 0;