Skip to content
Snippets Groups Projects
Commit 8da3ddd4 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge \\\"Simplify /dev/kmsg SELinux policy.\\\" am: aa2aa219 am: 98fbb318 

am: c817c3b0

Change-Id: Id6bd5f7e772fd00e3adef6c5f9fbf537799b0aab
parents 55933956 c817c3b0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
device.te
+ 0
− 1
View file @ 8da3ddd4
...@@ -51,7 +51,6 @@ type uio_device, dev_type; ...@@ -51,7 +51,6 @@ type uio_device, dev_type;
type tun_device, dev_type, mlstrustedobject; type tun_device, dev_type, mlstrustedobject;
type usbaccessory_device, dev_type, mlstrustedobject; type usbaccessory_device, dev_type, mlstrustedobject;
type usb_device, dev_type, mlstrustedobject; type usb_device, dev_type, mlstrustedobject;
type klog_device, dev_type;
type properties_device, dev_type; type properties_device, dev_type;
type properties_serial, dev_type; type properties_serial, dev_type;
type i2c_device, dev_type; type i2c_device, dev_type;
......
file_contexts
+ 0
− 1
View file @ 8da3ddd4
...@@ -137,7 +137,6 @@ ...@@ -137,7 +137,6 @@
/dev/watchdog u:object_r:watchdog_device:s0 /dev/watchdog u:object_r:watchdog_device:s0
/dev/xt_qtaguid u:object_r:qtaguid_device:s0 /dev/xt_qtaguid u:object_r:qtaguid_device:s0
/dev/zero u:object_r:zero_device:s0 /dev/zero u:object_r:zero_device:s0
/dev/__kmsg__ u:object_r:klog_device:s0
/dev/__properties__ u:object_r:properties_device:s0 /dev/__properties__ u:object_r:properties_device:s0
############################# #############################
# System files # System files
......
kernel.te
+ 1
− 2
View file @ 8da3ddd4
...@@ -41,8 +41,7 @@ allow kernel self:capability sys_resource; ...@@ -41,8 +41,7 @@ allow kernel self:capability sys_resource;
allow kernel self:capability sys_boot; allow kernel self:capability sys_boot;
allow kernel proc_sysrq:file w_file_perms; allow kernel proc_sysrq:file w_file_perms;
# Allow writing to /dev/__kmsg__ which was created prior to # Allow writing to /dev/kmsg which was created prior to loading policy.
# loading policy
allow kernel tmpfs:chr_file write; allow kernel tmpfs:chr_file write;
# Set checkreqprot by init.rc prior to switching to init domain. # Set checkreqprot by init.rc prior to switching to init domain.
......
ueventd.te
+ 2
− 4
View file @ 8da3ddd4
...@@ -3,10 +3,8 @@ ...@@ -3,10 +3,8 @@
type ueventd, domain, domain_deprecated; type ueventd, domain, domain_deprecated;
tmpfs_domain(ueventd) tmpfs_domain(ueventd)
# TODO: why is ueventd using __kmsg__ when it should just create # Write to /dev/kmsg.
# and use /dev/kmsg instead? allow ueventd kmsg_device:chr_file rw_file_perms;
type_transition ueventd device:chr_file klog_device "__kmsg__";
allow ueventd klog_device:chr_file { create open write unlink };
allow ueventd self:capability { chown mknod net_admin setgid fsetid sys_rawio dac_override fowner }; allow ueventd self:capability { chown mknod net_admin setgid fsetid sys_rawio dac_override fowner };
allow ueventd device:file create_file_perms; allow ueventd device:file create_file_perms;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment