am a7621f80: Merge "make unix_socket_connect() for property service a warning"

* commit 'a7621f808ed7bd5104af0616b80d14c3a8d4b3e9':
  make unix_socket_connect() for property service a warning
This commit is contained in:
Jeffrey Vander Stoep 2015-05-15 21:43:54 +00:00 committed by Android Git Automerger
commit db688133ae

View file

@ -129,6 +129,15 @@ typeattribute $1 bluetoothdomain;
# use set_prop(sourcedomain, targetproperty)
#
define(`unix_socket_connect', `
ifelse($2, `property', `
ifelse($3,`init', `
print(`deprecated: unix_socket_connect($1, $2, $3) Please use set_prop($1, <property name>) instead.')
')
')
__unix_socket_connect__($1, $2, $3)
')
define(`__unix_socket_connect__', `
allow $1 $2_socket:sock_file write;
allow $1 $3:unix_stream_socket connectto;
')
@ -139,7 +148,7 @@ allow $1 $3:unix_stream_socket connectto;
# targetproperty.
#
define(`set_prop', `
unix_socket_connect($1, property, init)
__unix_socket_connect__($1, property, init)
allow $1 $2:property_service set;
')
@ -244,11 +253,10 @@ allow $1 security_file:file r_file_perms;
# trigger runtime reload.
define(`selinux_manage_policy', `
security_access_policy($1)
unix_socket_connect($1, property, init)
allow $1 security_file:dir create_dir_perms;
allow $1 security_file:file create_file_perms;
allow $1 security_file:lnk_file { create rename unlink };
allow $1 security_prop:property_service set;
set_prop($1, security_prop)
')
#####################################
@ -257,11 +265,10 @@ allow $1 security_prop:property_service set;
# trigger runtime reload, change
# mmac enforcing mode and access logcat.
define(`mmac_manage_policy', `
unix_socket_connect($1, property, init)
allow $1 security_file:dir create_dir_perms;
allow $1 security_file:file create_file_perms;
allow $1 security_file:lnk_file { create rename unlink };
allow $1 security_prop:property_service set;
set_prop($1, security_prop)
')
#####################################
@ -374,3 +381,9 @@ define(`use_drmservice', `
allow drmserver $1:file { read open };
allow drmserver $1:process getattr;
')
##########################################
# print a message with a trailing newline
# print(`args')
define(`print', `errprint(`m4: '__file__: __line__`: $*
')')