commit b39a90f0bc224eeb43972b4f7a3dd651ae70b6f8
author Tianjie Xu <xunchang@google.com> Wed Mar 22 18:40:43 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 22 18:40:43 2017 +0000
tree a49512761ee50a3480aaad683ce9df930a22e2e7
parent a309fec8af226b5bcb6a62e3a4f0997aa39e299c
parent 71be88734a3d84a29f21fa020305d59b8431b9a4

Merge "Fix the permission of stashed blocks created by updater" am: d882b8892a am: deb2a29a42
am: 71be88734a

Change-Id: I52eaf4b1515b89488061c1494379028adacb492c

updater/blockimg.cpp

diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index 0fa83d9..8dbd8c7 100644
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -44,6 +44,7 @@
 #include <android-base/unique_fd.h>
 #include <applypatch/applypatch.h>
 #include <openssl/sha.h>
+#include <private/android_filesystem_config.h>
 #include <ziparchive/zip_archive.h>
 
 #include "edify/expr.h"
@@ -772,6 +773,11 @@
         return -1;
     }
 
+    if (fchown(fd, AID_SYSTEM, AID_SYSTEM) != 0) {  // system user
+        PLOG(ERROR) << "failed to chown \"" << fn << "\"";
+        return -1;
+    }
+
     if (write_all(fd, buffer, blocks * BLOCKSIZE) == -1) {
         return -1;
     }
@@ -841,6 +847,12 @@
       return -1;
     }
 
+    if (chown(dirname.c_str(), AID_SYSTEM, AID_SYSTEM) != 0) {  // system user
+      ErrorAbort(state, kStashCreationFailure, "chown \"%s\" failed: %s\n", dirname.c_str(),
+                 strerror(errno));
+      return -1;
+    }
+
     if (CacheSizeCheck(max_stash_size) != 0) {
       ErrorAbort(state, kStashCreationFailure, "not enough space for stash (%zu needed)\n",
                  max_stash_size);