From 9f0682dc5084ebcbc64e6c956a2574cd2d4d2b4b Mon Sep 17 00:00:00 2001
From: Sami Tolvanen <samitolvanen@google.com>
Date: Fri, 27 Feb 2015 22:06:55 +0000
Subject: [PATCH] Revert "Allow ueventd to set verity.* properties"

Updating properties from ueventd may lead to deadlocks with init in rare
cases, which makes these changes unnecessary after all.

This reverts commit 47cd53a55855b911b80b54b68702f5ee5db51d00.

Change-Id: I87bdd66f0ec025eb3a9ea17574a67e908f3de6da
---
 property.te       | 1 -
 property_contexts | 3 ---
 ueventd.te        | 6 ------
 3 files changed, 10 deletions(-)

diff --git a/property.te b/property.te
index 8faa4724a..6fedfa7a5 100644
--- a/property.te
+++ b/property.te
@@ -8,7 +8,6 @@ type radio_prop, property_type;
 type net_radio_prop, property_type;
 type system_radio_prop, property_type;
 type system_prop, property_type;
-type verity_prop, property_type;
 type vold_prop, property_type;
 type ctl_bootanim_prop, property_type;
 type ctl_default_prop, property_type;
diff --git a/property_contexts b/property_contexts
index 47e544a4e..06f6c174b 100644
--- a/property_contexts
+++ b/property_contexts
@@ -49,9 +49,6 @@ selinux.                u:object_r:security_prop:s0
 vold.                   u:object_r:vold_prop:s0
 crypto.                 u:object_r:vold_prop:s0
 
-# dm-verity properties
-verity.                 u:object_r:verity_prop:s0
-
 # ro.build.fingerprint is either set in /system/build.prop, or is
 # set at runtime by system_server.
 build.fingerprint       u:object_r:fingerprint_prop:s0
diff --git a/ueventd.te b/ueventd.te
index 0f2809d84..2e61e8852 100644
--- a/ueventd.te
+++ b/ueventd.te
@@ -23,9 +23,3 @@ allow ueventd efs_file:file r_file_perms;
 
 # Use setfscreatecon() to label /dev directories and files.
 allow ueventd self:process setfscreate;
-
-# Set property.
-unix_socket_connect(ueventd, property, init)
-
-# Property service
-allow ueventd verity_prop:property_service set;
-- 
GitLab