Revert "Revert "zygote: Allow device to append extra whitelisted paths"" (8ebdfca4) · Commits · e / os / android_frameworks_base

core/jni/fd_utils-inl-extra.h

0 → 100644

+29 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The CyanogenMod Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		/*
		#define PATH_WHITELIST_EXTRA_H \
		"/proc/apid", \
		"/proc/aprf",
		*/

		// Overload this file in your device specific config if you need
		// to add extra whitelisted paths.
		// WARNING: Only use this if necessary. Custom inits should be
		// checked for leaked file descriptors before even considering
		// this.
		// In order to add your files, copy the whole file (don't forget the copyright notice!),
		// uncomment the #define above and change the paths inside to match your requirements
		No newline at end of file

+5 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,8 @@
		#include "JNIHelp.h"
		#include "ScopedPrimitiveArray.h"

		#include <fd_utils-inl-extra.h>

		// Whitelist of open paths that the zygote is allowed to keep open.
		//
		// In addition to the paths listed here, all files ending with
		@@ -57,6 +59,9 @@ static const char* kPathWhitelist[] = {
		"/dev/ion",
		"/dev/dri/renderD129", // Fixes b/31172436
		"/system/framework/org.cyanogenmod.platform-res.apk",
		#ifdef PATH_WHITELIST_EXTRA_H
		PATH_WHITELIST_EXTRA_H
		#endif
		};

		static const char* kFdPath = "/proc/self/fd";