commit db58849a95b43b164506604c81b685c5050b8a63
author Benoit Goby <benoit@android.com> Tue Aug 14 17:36:49 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 14 17:36:49 2012 -0700
tree 2bd4f3acd3754ab504f1e5d60c32e6ad99cbc557
parent 3fe22e6b26b88a07b391ba6a11807610251128af
parent 5c8574b51210be53efbb488965db0b8591c8d1cf

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

* commit '5c8574b51210be53efbb488965db0b8591c8d1cf':
  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;