commit cdecd3ca4c0bf9dae7f801eecefb681bb8760cc5
author Martijn Coenen <maco@google.com> Wed Aug 12 06:38:37 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 12 06:38:37 2020 +0000
tree 2bfc4beaa2ea3c8710f5653514e7483f0720b663
parent 5b1f0808b7b809b63f1374eeca2ed7b2bd1cd5da
parent 47f61db25e085434b3598fea2682960ee5ed2c9c

Merge "Add policy for LOOP_CONFIGURE ioctl."

prebuilts/api/30.0/private/apexd.te

diff --git a/prebuilts/api/30.0/private/apexd.te b/prebuilts/api/30.0/private/apexd.te
index 9e702dd..7c7ddc6 100644
--- a/prebuilts/api/30.0/private/apexd.te
+++ b/prebuilts/api/30.0/private/apexd.te
@@ -37,6 +37,7 @@
   LOOP_SET_DIRECT_IO
   LOOP_CLR_FD
   BLKFLSBUF
+  LOOP_CONFIGURE
 };
 # allow apexd to access /dev/block
 allow apexd block_device:dir r_dir_perms;

prebuilts/api/30.0/public/ioctl_defines

diff --git a/prebuilts/api/30.0/public/ioctl_defines b/prebuilts/api/30.0/public/ioctl_defines
index 4cc3bba..558dd92 100644
--- a/prebuilts/api/30.0/public/ioctl_defines
+++ b/prebuilts/api/30.0/public/ioctl_defines
@@ -1370,6 +1370,7 @@
 define(`LOGGER_SET_VERSION', `0x0000ae06')
 define(`LOOP_CHANGE_FD', `0x00004c06')
 define(`LOOP_CLR_FD', `0x00004c01')
+define(`LOOP_CONFIGURE', `0x00004c0a')
 define(`LOOP_CTL_ADD', `0x00004c80')
 define(`LOOP_CTL_GET_FREE', `0x00004c82')
 define(`LOOP_CTL_REMOVE', `0x00004c81')

private/apexd.te

diff --git a/private/apexd.te b/private/apexd.te
index 97e2539..4d1938a 100644
--- a/private/apexd.te
+++ b/private/apexd.te
@@ -37,6 +37,7 @@
   LOOP_SET_DIRECT_IO
   LOOP_CLR_FD
   BLKFLSBUF
+  LOOP_CONFIGURE
 };
 # allow apexd to access /dev/block
 allow apexd block_device:dir r_dir_perms;

public/ioctl_defines

diff --git a/public/ioctl_defines b/public/ioctl_defines
index 4cc3bba..558dd92 100644
--- a/public/ioctl_defines
+++ b/public/ioctl_defines
@@ -1370,6 +1370,7 @@
 define(`LOGGER_SET_VERSION', `0x0000ae06')
 define(`LOOP_CHANGE_FD', `0x00004c06')
 define(`LOOP_CLR_FD', `0x00004c01')
+define(`LOOP_CONFIGURE', `0x00004c0a')
 define(`LOOP_CTL_ADD', `0x00004c80')
 define(`LOOP_CTL_GET_FREE', `0x00004c82')
 define(`LOOP_CTL_REMOVE', `0x00004c81')