Merge "Copy extension names to an owning container to prevent use-after-free" (f296a878) · Commits · e / os / android_frameworks_base

libs/hwui/renderthread/VulkanManager.cpp

+15 −13

Original line number	Diff line number	Diff line
		@@ -81,7 +81,9 @@ void VulkanManager::destroy() {
		mDevice = VK_NULL_HANDLE;
		mPhysicalDevice = VK_NULL_HANDLE;
		mInstance = VK_NULL_HANDLE;
		mInstanceExtensionsOwner.clear();
		mInstanceExtensions.clear();
		mDeviceExtensionsOwner.clear();
		mDeviceExtensions.clear();
		free_features_extensions_structs(mPhysicalDeviceFeatures2);
		mPhysicalDeviceFeatures2 = {};
		@@ -106,18 +108,18 @@ void VulkanManager::setupDevice(GrVkExtensions& grExtensions, VkPhysicalDeviceFe
		uint32_t extensionCount = 0;
		err = mEnumerateInstanceExtensionProperties(nullptr, &extensionCount, nullptr);
		LOG_ALWAYS_FATAL_IF(VK_SUCCESS != err);
		std::unique_ptr<VkExtensionProperties[]> extensions(
		new VkExtensionProperties[extensionCount]);
		err = mEnumerateInstanceExtensionProperties(nullptr, &extensionCount, extensions.get());
		mInstanceExtensionsOwner.resize(extensionCount);
		err = mEnumerateInstanceExtensionProperties(nullptr, &extensionCount,
		mInstanceExtensionsOwner.data());
		LOG_ALWAYS_FATAL_IF(VK_SUCCESS != err);
		bool hasKHRSurfaceExtension = false;
		bool hasKHRAndroidSurfaceExtension = false;
		for (uint32_t i = 0; i < extensionCount; ++i) {
		mInstanceExtensions.push_back(extensions[i].extensionName);
		if (!strcmp(extensions[i].extensionName, VK_KHR_SURFACE_EXTENSION_NAME)) {
		for (const VkExtensionProperties& extension : mInstanceExtensionsOwner) {
		mInstanceExtensions.push_back(extension.extensionName);
		if (!strcmp(extension.extensionName, VK_KHR_SURFACE_EXTENSION_NAME)) {
		hasKHRSurfaceExtension = true;
		}
		if (!strcmp(extensions[i].extensionName,VK_KHR_ANDROID_SURFACE_EXTENSION_NAME)) {
		if (!strcmp(extension.extensionName, VK_KHR_ANDROID_SURFACE_EXTENSION_NAME)) {
		hasKHRAndroidSurfaceExtension = true;
		}
		}
		@@ -196,15 +198,14 @@ void VulkanManager::setupDevice(GrVkExtensions& grExtensions, VkPhysicalDeviceFe
		err = mEnumerateDeviceExtensionProperties(mPhysicalDevice, nullptr, &extensionCount,
		nullptr);
		LOG_ALWAYS_FATAL_IF(VK_SUCCESS != err);
		std::unique_ptr<VkExtensionProperties[]> extensions(
		new VkExtensionProperties[extensionCount]);
		mDeviceExtensionsOwner.resize(extensionCount);
		err = mEnumerateDeviceExtensionProperties(mPhysicalDevice, nullptr, &extensionCount,
		extensions.get());
		mDeviceExtensionsOwner.data());
		LOG_ALWAYS_FATAL_IF(VK_SUCCESS != err);
		bool hasKHRSwapchainExtension = false;
		for (uint32_t i = 0; i < extensionCount; ++i) {
		mDeviceExtensions.push_back(extensions[i].extensionName);
		if (!strcmp(extensions[i].extensionName, VK_KHR_SWAPCHAIN_EXTENSION_NAME)) {
		for (const VkExtensionProperties& extension : mDeviceExtensionsOwner) {
		mDeviceExtensions.push_back(extension.extensionName);
		if (!strcmp(extension.extensionName, VK_KHR_SWAPCHAIN_EXTENSION_NAME)) {
		hasKHRSwapchainExtension = true;
		}
		}
		@@ -217,6 +218,7 @@ void VulkanManager::setupDevice(GrVkExtensions& grExtensions, VkPhysicalDeviceFe
		}
		return vkGetInstanceProcAddr(instance, proc_name);
		};

		grExtensions.init(getProc, mInstance, mPhysicalDevice, mInstanceExtensions.size(),
		mInstanceExtensions.data(), mDeviceExtensions.size(), mDeviceExtensions.data());

libs/hwui/renderthread/VulkanManager.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,8 @@ public:
		status_t createReleaseFence(sp<Fence>& nativeFence);

		// Returned pointers are owned by VulkanManager.
		// An instance of VkFunctorInitParams returned from getVkFunctorInitParams refers to
		// the internal state of VulkanManager: VulkanManager must be alive to use the returned value.
		VkFunctorInitParams getVkFunctorInitParams() const;

		sk_sp<GrContext> createContext(const GrContextOptions& options);
		@@ -164,7 +166,9 @@ private:

		// Variables saved to populate VkFunctorInitParams.
		static const uint32_t mAPIVersion = VK_MAKE_VERSION(1, 1, 0);
		std::vector<VkExtensionProperties> mInstanceExtensionsOwner;
		std::vector<const char*> mInstanceExtensions;
		std::vector<VkExtensionProperties> mDeviceExtensionsOwner;
		std::vector<const char*> mDeviceExtensions;
		VkPhysicalDeviceFeatures2 mPhysicalDeviceFeatures2{};