Snap for 8512771 from d02ad101446b05a5e6b948038d5065b3d6faa97f to tm-d1-release (9858b8ea) · Commits · e / os / android_system_core

init/bootchart.cpp

+14 −0

Original line number	Diff line number	Diff line
		@@ -140,6 +140,20 @@ static void log_processes(FILE* log) {
		static void bootchart_thread_main() {
		LOG(INFO) << "Bootcharting started";

		// Unshare the mount namespace of this thread so that the init process itself can switch
		// the mount namespace later while this thread is still running.
		// Otherwise, setns() call invoked as part of `enter_default_mount_ns` fails with EINVAL.
		//
		// Note that after unshare()'ing the mount namespace from the main thread, this thread won't
		// receive mount/unmount events from the other mount namespace unless the events are happening
		// from under a sharable mount.
		//
		// The bootchart thread is safe to unshare the mount namespace because it only reads from /proc
		// and write to /data which are not private mounts.
		if (unshare(CLONE_NEWNS) == -1) {
		PLOG(ERROR) << "Cannot create mount namespace";
		return;
		}
		// Open log files.
		auto stat_log = fopen_unique("/data/bootchart/proc_stat.log", "we");
		if (!stat_log) return;

+6 −8

Original line number	Diff line number	Diff line
		@@ -279,12 +279,10 @@ ssize_t VectorImpl::replaceAt(const void* prototype, size_t index)

		ssize_t VectorImpl::removeItemsAt(size_t index, size_t count)
		{
		ALOG_ASSERT((index+count)<=size(),
		"[%p] remove: index=%d, count=%d, size=%d",
		this, (int)index, (int)count, (int)size());

		if ((index+count) > size())
		return BAD_VALUE;
		size_t end;
		LOG_ALWAYS_FATAL_IF(__builtin_add_overflow(index, count, &end), "overflow: index=%zu count=%zu",
		index, count);
		if (end > size()) return BAD_VALUE;
		_shrink(index, count);
		return index;
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -136,4 +136,13 @@ TEST_F(VectorTest, editArray_Shared) {
		}
		}

		TEST_F(VectorTest, removeItemsAt_overflow) {
		android::Vector<int> v;
		for (int i = 0; i < 666; i++) v.add(i);

		ASSERT_DEATH(v.removeItemsAt(SIZE_MAX, 666), "overflow");
		ASSERT_DEATH(v.removeItemsAt(666, SIZE_MAX), "overflow");
		ASSERT_DEATH(v.removeItemsAt(SIZE_MAX, SIZE_MAX), "overflow");
		}

		} // namespace android