Merge "restorecon tombstone directory."
diff --git a/adb/framebuffer_service.c b/adb/framebuffer_service.c
index 862dd91..20c08d2 100644
--- a/adb/framebuffer_service.c
+++ b/adb/framebuffer_service.c
@@ -19,6 +19,9 @@
#include <unistd.h>
#include <string.h>
#include <fcntl.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/wait.h>
#include "fdevent.h"
#include "adb.h"
@@ -169,6 +172,8 @@
if(writex(fd, buf, fbinfo.size % sizeof(buf))) goto done;
done:
+ TEMP_FAILURE_RETRY(waitpid(pid, NULL, 0));
+
close(fds[0]);
close(fds[1]);
close(fd);
diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index ff99173..57363d8 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -54,8 +54,6 @@
#define O_BINARY 0
#endif
-#define DEFAULT_SPARSE_LIMIT (256 * 1024 * 1024)
-
char cur_product[FB_RESPONSE_SZ + 1];
void bootimg_set_cmdline(boot_img_hdr *h, const char *cmdline);
@@ -281,7 +279,7 @@
" -b <base_addr> specify a custom kernel base address\n"
" -n <page size> specify the nand page size. default: 2048\n"
" -S <size>[K|M|G] automatically sparse files greater than\n"
- " size. default: 256M, 0 to disable\n"
+ " size. 0 to disable\n"
);
}
@@ -535,7 +533,7 @@
if (target_sparse_limit > 0) {
limit = target_sparse_limit;
} else {
- limit = DEFAULT_SPARSE_LIMIT;
+ return 0;
}
}
@@ -825,7 +823,7 @@
return 1;
}
- if (!strcmp(*argv, "devices")) {
+ if (argc > 0 && !strcmp(*argv, "devices")) {
skip(1);
list_devices();
return 0;
diff --git a/libdiskconfig/config_mbr.c b/libdiskconfig/config_mbr.c
index 703484c..b89d382 100644
--- a/libdiskconfig/config_mbr.c
+++ b/libdiskconfig/config_mbr.c
@@ -152,7 +152,7 @@
/* we are going to write the ebr at the current LBA, and then bump the
* lba counter since that is where the logical data partition will start */
- item->offset = (*lba) * dinfo->sect_size;
+ item->offset = ((loff_t)(*lba)) * dinfo->sect_size;
(*lba)++;
ebr = (struct pc_boot_record *) &item->data;
diff --git a/libsparse/sparse.c b/libsparse/sparse.c
index 189b4c0..741e8c6 100644
--- a/libsparse/sparse.c
+++ b/libsparse/sparse.c
@@ -139,7 +139,7 @@
DIV_ROUND_UP(backed_block_len(bb), s->block_size);
}
- pad = s->len - last_block * s->block_size;
+ pad = s->len - (int64_t)last_block * s->block_size;
assert(pad >= 0);
if (pad > 0) {
write_skip_chunk(out, pad);
diff --git a/rootdir/etc/init.goldfish.rc b/rootdir/etc/init.goldfish.rc
index 83b7f8a..cde9dee 100644
--- a/rootdir/etc/init.goldfish.rc
+++ b/rootdir/etc/init.goldfish.rc
@@ -5,6 +5,10 @@
symlink /mnt/sdcard /sdcard
on boot
+ setsebool in_qemu=1
+ restorecon /sys/qemu_trace/process_name
+ restorecon /sys/qemu_trace/state
+ restorecon /sys/qemu_trace/symbol
setprop ARGH ARGH
setprop net.eth0.gw 10.0.2.2
setprop net.eth0.dns1 10.0.2.3
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 63e0ee9..054c2ca 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -12,6 +12,10 @@
# Set init and its forked children's oom_adj.
write /proc/1/oom_adj -16
+ # Set the security context for the init process.
+ # This should occur before anything else (e.g. ueventd) is started.
+ setcon u:r:init:s0
+
start ueventd
# create mountpoints
@@ -128,10 +132,14 @@
# We chown/chmod /cache again so because mount is run as root + defaults
chown system cache /cache
chmod 0770 /cache
+ # We restorecon /cache in case the cache partition has been reset.
+ restorecon /cache
# This may have been created by the recovery system with odd permissions
chown system cache /cache/recovery
chmod 0770 /cache/recovery
+ # This may have been created by the recovery system with the wrong context.
+ restorecon /cache/recovery
#change permissions on vmallocinfo so we can grab it from bugreports
chown root log /proc/vmallocinfo
@@ -150,6 +158,8 @@
# We chown/chmod /data again so because mount is run as root + defaults
chown system system /data
chmod 0771 /data
+ # We restorecon /data in case the userdata partition has been reset.
+ restorecon /data
# Create dump dir and collect dumps.
# Do this before we mount cache so eventually we can use cache for
@@ -343,6 +353,7 @@
service ueventd /sbin/ueventd
class core
critical
+ seclabel u:r:ueventd:s0
service console /system/bin/sh
class core
@@ -358,6 +369,7 @@
service adbd /sbin/adbd
class core
disabled
+ seclabel u:r:adbd:s0
# adbd on at boot in emulator
on property:ro.kernel.qemu=1
diff --git a/toolbox/kill.c b/toolbox/kill.c
index b79805f..fa2f649 100644
--- a/toolbox/kill.c
+++ b/toolbox/kill.c
@@ -42,7 +42,9 @@
/* non-SUS signals */
_SIG(IO),
_SIG(PWR),
+#ifdef SIGSTKFLT
_SIG(STKFLT),
+#endif
_SIG(WINCH),
#undef _SIG
};