From 9ac5d01faa157d7b4e747ac1962e856825c955d1 Mon Sep 17 00:00:00 2001 From: Josh Gao <jmgao@google.com> Date: Fri, 26 May 2017 00:31:03 +0000 Subject: [PATCH] Revert "Add /dev/kmsg_debug." This reverts commit a015186fab804b4cc8f7d26221451b5340db11ce. Bug: http://b/62101480 Change-Id: I8e889e3d50cf1749168acc526f8a8901717feb46 --- private/file_contexts | 1 - public/crash_dump.te | 3 --- public/device.te | 1 - public/init.te | 4 ---- 4 files changed, 9 deletions(-) diff --git a/private/file_contexts b/private/file_contexts index 6b6498424..5433ea869 100644 --- a/private/file_contexts +++ b/private/file_contexts @@ -104,7 +104,6 @@ /dev/ptmx u:object_r:ptmx_device:s0 /dev/pvrsrvkm u:object_r:gpu_device:s0 /dev/kmsg u:object_r:kmsg_device:s0 -/dev/kmsg_debug u:object_r:kmsg_debug_device:s0 /dev/null u:object_r:null_device:s0 /dev/nvhdcp1 u:object_r:video_device:s0 /dev/random u:object_r:random_device:s0 diff --git a/public/crash_dump.te b/public/crash_dump.te index 0bab782f1..a0e278a13 100644 --- a/public/crash_dump.te +++ b/public/crash_dump.te @@ -15,9 +15,6 @@ dontaudit crash_dump self:capability { sys_ptrace }; userdebug_or_eng(` allow crash_dump logd:process { ptrace signal sigchld sigstop sigkill }; - - # Let crash_dump write to /dev/kmsg_debug crashes that happen before logd comes up. - allow crash_dump kmsg_debug_device:chr_file { open append }; ') # Use inherited file descriptors diff --git a/public/device.te b/public/device.te index 0f64bfabb..4a3bec91f 100644 --- a/public/device.te +++ b/public/device.te @@ -36,7 +36,6 @@ type mtp_device, dev_type, mlstrustedobject; type nfc_device, dev_type; type ptmx_device, dev_type, mlstrustedobject; type kmsg_device, dev_type; -type kmsg_debug_device, dev_type; type null_device, dev_type, mlstrustedobject; type random_device, dev_type, mlstrustedobject; type sensors_device, dev_type; diff --git a/public/init.te b/public/init.te index 4571c491a..e293cefd5 100644 --- a/public/init.te +++ b/public/init.te @@ -13,10 +13,6 @@ allow init tmpfs:chr_file { create setattr unlink rw_file_perms }; # /dev/kmsg allow init tmpfs:chr_file relabelfrom; allow init kmsg_device:chr_file { write relabelto }; -# /dev/kmsg_debug -userdebug_or_eng(` - allow init kmsg_debug_device:chr_file { write relabelto }; -') # /dev/__properties__ allow init properties_device:dir relabelto; allow init properties_serial:file { write relabelto }; -- GitLab