diff --git a/public/domain.te b/public/domain.te
index 68e81ed7de224fe0ccebe715557b1ce1d349e8f9..bbf4d687ccce55edaa1b17e0a6d086e39326297d 100644
--- a/public/domain.te
+++ b/public/domain.te
@@ -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;
diff --git a/public/system_server.te b/public/system_server.te
index 924a6d308351baa7bcfd28192c1359a1eb058ad2..9c075fbe1603e464061602281a65970e0fb17a4f 100644
--- a/public/system_server.te
+++ b/public/system_server.te
@@ -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;