Merge "Revert "Restore system_server ioctl socket access.""

This commit is contained in:
TreeHugger Robot 2016-11-08 14:35:12 +00:00 committed by Android (Google) Code Review
commit b602b3b6b5
2 changed files with 2 additions and 2 deletions

View file

@ -175,7 +175,7 @@ allowxperm domain domain:{ unix_dgram_socket unix_stream_socket }
###
# All socket ioctls must be restricted to a whitelist.
neverallowxperm { domain -system_server } domain:socket_class_set ioctl { 0 };
neverallowxperm domain domain:socket_class_set ioctl { 0 };
# Do not allow any domain other than init or recovery to create unlabeled files.
neverallow { domain -init -recovery } unlabeled:dir_file_class_set create;

View file

@ -81,7 +81,7 @@ allow system_server self:netlink_generic_socket create_socket_perms_no_ioctl;
# to the kernel. The ioctl permission is specifically omitted here, but may
# be added to device specific policy along with the ioctl commands to be
# whitelisted.
allow system_server self:socket create_socket_perms;
allow system_server self:socket create_socket_perms_no_ioctl;
# Set and get routes directly via netlink.
allow system_server self:netlink_route_socket nlmsg_write;