From 850de1995cf026a4c9a8809303ddba5fe4cd3e13 Mon Sep 17 00:00:00 2001 From: Michael Runge Date: Mon, 22 Jul 2013 20:42:44 +0000 Subject: [PATCH] Revert "Update OTA to understand SELinux filesystem labels" This reverts commit fbbd79530adc6ddd6bbfb3c5fc60ba5ec0ce5f2d. All incremental auto OTAs broken b/9964074 Change-Id: I500d2ac194804abd20a0e01d9862fd42e8f5d2de --- core/Makefile | 7 ++- tools/fs_config/Android.mk | 1 - tools/fs_config/fs_config.c | 80 ++------------------------------ tools/releasetools/edify_generator.py | 10 ++-- tools/releasetools/ota_from_target_files | 42 ++++++++--------- 5 files changed, 32 insertions(+), 108 deletions(-) diff --git a/core/Makefile b/core/Makefile index 171936f09..eb02ff454 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1147,7 +1147,6 @@ $(BUILT_TARGET_FILES_PACKAGE): \ $(INSTALLED_CACHEIMAGE_TARGET) \ $(INSTALLED_VENDORIMAGE_TARGET) \ $(INSTALLED_ANDROID_INFO_TXT_TARGET) \ - $(SELINUX_FC) \ $(built_ota_tools) \ $(APKCERTS_FILE) \ $(HOST_OUT_EXECUTABLES)/fs_config \ @@ -1239,9 +1238,9 @@ endif @# Zip everything up, preserving symlinks $(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .) @# Run fs_config on all the system, boot ramdisk, and recovery ramdisk files in the zip, and save the output - $(hide) zipinfo -1 $@ | awk 'BEGIN { FS="SYSTEM/" } /^SYSTEM\// {print "system/" $$2}' | $(HOST_OUT_EXECUTABLES)/fs_config -S $(SELINUX_FC) > $(zip_root)/META/filesystem_config.txt - $(hide) zipinfo -1 $@ | awk 'BEGIN { FS="BOOT/RAMDISK/" } /^BOOT\/RAMDISK\// {print $$2}' | $(HOST_OUT_EXECUTABLES)/fs_config -S $(SELINUX_FC) > $(zip_root)/META/boot_filesystem_config.txt - $(hide) zipinfo -1 $@ | awk 'BEGIN { FS="RECOVERY/RAMDISK/" } /^RECOVERY\/RAMDISK\// {print $$2}' | $(HOST_OUT_EXECUTABLES)/fs_config -S $(SELINUX_FC) > $(zip_root)/META/recovery_filesystem_config.txt + $(hide) zipinfo -1 $@ | awk 'BEGIN { FS="SYSTEM/" } /^SYSTEM\// {print "system/" $$2}' | $(HOST_OUT_EXECUTABLES)/fs_config > $(zip_root)/META/filesystem_config.txt + $(hide) zipinfo -1 $@ | awk 'BEGIN { FS="BOOT/RAMDISK/" } /^BOOT\/RAMDISK\// {print $$2}' | $(HOST_OUT_EXECUTABLES)/fs_config > $(zip_root)/META/boot_filesystem_config.txt + $(hide) zipinfo -1 $@ | awk 'BEGIN { FS="RECOVERY/RAMDISK/" } /^RECOVERY\/RAMDISK\// {print $$2}' | $(HOST_OUT_EXECUTABLES)/fs_config > $(zip_root)/META/recovery_filesystem_config.txt $(hide) (cd $(zip_root) && zip -q ../$(notdir $@) META/*filesystem_config.txt) .PHONY: target-files-package diff --git a/tools/fs_config/Android.mk b/tools/fs_config/Android.mk index 02deabbf7..5ef32dd34 100644 --- a/tools/fs_config/Android.mk +++ b/tools/fs_config/Android.mk @@ -17,7 +17,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := fs_config.c LOCAL_MODULE := fs_config -LOCAL_STATIC_LIBRARIES := libselinux LOCAL_FORCE_STATIC_EXECUTABLE := true include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/fs_config/fs_config.c b/tools/fs_config/fs_config.c index 60c323800..f6760cc5a 100644 --- a/tools/fs_config/fs_config.c +++ b/tools/fs_config/fs_config.c @@ -15,16 +15,11 @@ */ #include -#include #include #include #include #include -#include -#include -#include - #include "private/android_filesystem_config.h" // This program takes a list of files and directories (indicated by a @@ -34,56 +29,19 @@ // // Example input: // -// system/etc/dbus.conf -// data/app/ +// system/etc/dbus.conf +// data/app/ // // Output: // -// system/etc/dbus.conf 1002 1002 440 -// data/app 1000 1000 771 -// -// or if -S is used: -// -// system/etc/dbus.conf 1002 1002 440 u:object_r:system_file:s0 -// data/app 1000 1000 771 u:object_r:apk_data_file:s0 +// system/etc/dbus.conf 1002 1002 440 +// data/app 1000 1000 771 // // Note that the output will omit the trailing slash from // directories. -static struct selabel_handle* get_sehnd(const char* context_file) { - struct selinux_opt seopts[] = { { SELABEL_OPT_PATH, context_file } }; - struct selabel_handle* sehnd = selabel_open(SELABEL_CTX_FILE, seopts, 1); - - if (!sehnd) { - perror("error running selabel_open"); - exit(EXIT_FAILURE); - } - return sehnd; -} - -static void usage() { - fprintf(stderr, "Usage: fs_config [-S context_file]\n"); -} - int main(int argc, char** argv) { char buffer[1024]; - const char* context_file = NULL; - struct selabel_handle* sehnd = NULL; - int opt; - while((opt = getopt(argc, argv, "S:")) != -1) { - switch(opt) { - case 'S': - context_file = optarg; - break; - default: - usage(); - exit(EXIT_FAILURE); - } - } - - if (context_file != NULL) { - sehnd = get_sehnd(context_file); - } while (fgets(buffer, 1023, stdin) != NULL) { int is_dir = 0; @@ -106,35 +64,7 @@ int main(int argc, char** argv) { unsigned uid = 0, gid = 0, mode = 0; uint64_t capabilities; fs_config(buffer, is_dir, &uid, &gid, &mode, &capabilities); - printf("%s %d %d %o", buffer, uid, gid, mode); - - if (sehnd != NULL) { - size_t buffer_strlen = strnlen(buffer, sizeof(buffer)); - if (buffer_strlen >= sizeof(buffer)) { - fprintf(stderr, "non null terminated buffer, aborting\n"); - exit(EXIT_FAILURE); - } - size_t full_name_size = buffer_strlen + 2; - char* full_name = (char*) malloc(full_name_size); - if (full_name == NULL) { - perror("malloc"); - exit(EXIT_FAILURE); - } - - full_name[0] = '/'; - strncpy(full_name + 1, buffer, full_name_size - 1); - full_name[full_name_size - 1] = '\0'; - - char* secontext; - if (selabel_lookup(sehnd, &secontext, full_name, ( mode | (is_dir ? S_IFDIR : S_IFREG)))) { - secontext = strdup("u:object_r:unlabeled:s0"); - } - - printf(" %s", secontext); - free(full_name); - freecon(secontext); - } - printf("\n"); + printf("%s %d %d %o\n", buffer, uid, gid, mode); } return 0; } diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py index cafdeb3b5..9ef19264b 100644 --- a/tools/releasetools/edify_generator.py +++ b/tools/releasetools/edify_generator.py @@ -217,14 +217,14 @@ class EdifyGenerator(object): else: raise ValueError("don't know how to write \"%s\" partitions" % (p.fs_type,)) - def SetPermissions(self, fn, uid, gid, mode, secontext): + def SetPermissions(self, fn, uid, gid, mode): """Set file ownership and permissions.""" - self.script.append('set_perm2(%d, %d, 0%o, "%s", "%s");' % (uid, gid, mode, secontext, fn)) + self.script.append('set_perm(%d, %d, 0%o, "%s");' % (uid, gid, mode, fn)) - def SetPermissionsRecursive(self, fn, uid, gid, dmode, fmode, secontext): + def SetPermissionsRecursive(self, fn, uid, gid, dmode, fmode): """Recursively set path ownership and permissions.""" - self.script.append('set_perm2_recursive(%d, %d, 0%o, 0%o, "%s", "%s");' - % (uid, gid, dmode, fmode, secontext, fn)) + self.script.append('set_perm_recursive(%d, %d, 0%o, 0%o, "%s");' + % (uid, gid, dmode, fmode, fn)) def MakeSymlinks(self, symlink_list): """Create symlinks, given a list of (dest, link) pairs.""" diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index e79c13fc2..1e1d04e24 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -117,7 +117,6 @@ class Item: self.uid = None self.gid = None self.mode = None - self.secontext = None self.dir = dir if name: @@ -167,66 +166,63 @@ class Item: for line in output.split("\n"): if not line: continue - name, uid, gid, mode, secontext = line.split() + name, uid, gid, mode = line.split() i = cls.ITEMS.get(name, None) if i is not None: i.uid = int(uid) i.gid = int(gid) i.mode = int(mode, 8) - i.secontext = secontext if i.dir: i.children.sort(key=lambda i: i.name) # set metadata for the files generated by this script. i = cls.ITEMS.get("system/recovery-from-boot.p", None) - if i: i.uid, i.gid, i.mode, i.secontext = 0, 0, 0644, "u:object_r:system_file:s0" + if i: i.uid, i.gid, i.mode = 0, 0, 0644 i = cls.ITEMS.get("system/etc/install-recovery.sh", None) - if i: i.uid, i.gid, i.mode, i.secontext = 0, 0, 0544, "u:object_r:system_file:s0" + if i: i.uid, i.gid, i.mode = 0, 0, 0544 def CountChildMetadata(self): - """Count up the (uid, gid, mode, secontext) tuples for all children and + """Count up the (uid, gid, mode) tuples for all children and determine the best strategy for using set_perm_recursive and set_perm to correctly chown/chmod all the files to their desired values. Recursively calls itself for all descendants. - Returns a dict of {(uid, gid, dmode, fmode, secontext): count} counting up + Returns a dict of {(uid, gid, dmode, fmode): count} counting up all descendants of this node. (dmode or fmode may be None.) Also sets the best_subtree of each directory Item to the (uid, gid, - dmode, fmode, secontext) tuple that will match the most descendants of that + dmode, fmode) tuple that will match the most descendants of that Item. """ assert self.dir - d = self.descendants = {(self.uid, self.gid, self.mode, None, self.secontext): 1} + d = self.descendants = {(self.uid, self.gid, self.mode, None): 1} for i in self.children: if i.dir: for k, v in i.CountChildMetadata().iteritems(): d[k] = d.get(k, 0) + v else: - k = (i.uid, i.gid, None, i.mode, i.secontext) + k = (i.uid, i.gid, None, i.mode) d[k] = d.get(k, 0) + 1 - # Find the (uid, gid, dmode, fmode, secontext) tuple that matches the most + # Find the (uid, gid, dmode, fmode) tuple that matches the most # descendants. # First, find the (uid, gid) pair that matches the most # descendants. ug = {} - for (uid, gid, _, _, _), count in d.iteritems(): + for (uid, gid, _, _), count in d.iteritems(): ug[(uid, gid)] = ug.get((uid, gid), 0) + count ug = MostPopularKey(ug, (0, 0)) - # Now find the dmode, fmode and secontext that match the most descendants + # Now find the dmode and fmode that match the most descendants # with that (uid, gid), and choose those. best_dmode = (0, 0755) best_fmode = (0, 0644) - best_secontext = (0, "u:object_r:system_file:s0") for k, count in d.iteritems(): if k[:2] != ug: continue if k[2] is not None and count >= best_dmode[0]: best_dmode = (count, k[2]) if k[3] is not None and count >= best_fmode[0]: best_fmode = (count, k[3]) - if k[4] is not None and count >= best_secontext[0]: best_secontext = (count, k[4]) - self.best_subtree = ug + (best_dmode[1], best_fmode[1], best_secontext[1]) + self.best_subtree = ug + (best_dmode[1], best_fmode[1]) return d @@ -238,7 +234,7 @@ class Item: self.CountChildMetadata() def recurse(item, current): - # current is the (uid, gid, dmode, fmode, secontext) tuple that the current + # current is the (uid, gid, dmode, fmode) tuple that the current # item (and all its children) have already been set to. We only # need to issue set_perm/set_perm_recursive commands if we're # supposed to be something different. @@ -248,17 +244,17 @@ class Item: current = item.best_subtree if item.uid != current[0] or item.gid != current[1] or \ - item.mode != current[2] or item.secontext != current[4]: - script.SetPermissions("/"+item.name, item.uid, item.gid, item.mode, item.secontext) + item.mode != current[2]: + script.SetPermissions("/"+item.name, item.uid, item.gid, item.mode) for i in item.children: recurse(i, current) else: if item.uid != current[0] or item.gid != current[1] or \ - item.mode != current[3] or item.secontext != current[4]: - script.SetPermissions("/"+item.name, item.uid, item.gid, item.mode, item.secontext) + item.mode != current[3]: + script.SetPermissions("/"+item.name, item.uid, item.gid, item.mode) - recurse(self, (-1, -1, -1, -1, "u:object_r:unlabeled:s0")) + recurse(self, (-1, -1, -1, -1)) def CopySystemFiles(input_zip, output_zip=None, @@ -737,7 +733,7 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): for item in deferred_patch_list: fn, tf, sf, size, _ = item script.ApplyPatch("/"+fn, "-", tf.size, tf.sha1, sf.sha1, "patch/"+fn+".p") - script.SetPermissions("/system/build.prop", 0, 0, 0644, "u:object_r:system_file:s0") + script.SetPermissions("/system/build.prop", 0, 0, 0644) script.AddToZip(target_zip, output_zip) WriteMetadata(metadata, output_zip) -- 2.11.0