Merge "Audit app access to /proc/net/*"

private/app.te

@@ -177,6 +177,7 @@ userdebug_or_eng(`
 allow appdomain qtaguid_proc:file rw_file_perms;
 # read /proc/net/xt_qtguid/stats
 r_dir_file({ appdomain -ephemeral_app}, proc_net)
+auditallow appdomain proc_net:file *; # ({ appdomain -ephemeral_app}, proc_net)
 # Everybody can read the xt_qtaguid resource tracking misc dev.
 # So allow all apps to read from /dev/xt_qtaguid.
 allow appdomain qtaguid_device:chr_file r_file_perms;

private/compat/26.0/26.0.cil

@@ -488,7 +488,9 @@
 (typeattributeset proc_meminfo_26_0 (proc_meminfo))
 (typeattributeset proc_misc_26_0 (proc_misc))
 (typeattributeset proc_modules_26_0 (proc_modules))
-(typeattributeset proc_net_26_0 (proc_net))
+(typeattributeset proc_net_26_0
+  ( proc_net
+    proc_net_xt_qtaguid_stats))
 (typeattributeset proc_overcommit_memory_26_0 (proc_overcommit_memory))
 (typeattributeset proc_perf_26_0 (proc_perf))
 (typeattributeset proc_security_26_0 (proc_security))

private/genfs_contexts

@@ -17,6 +17,7 @@ genfscon proc /modules u:object_r:proc_modules:s0
 genfscon proc /mounts u:object_r:proc_mounts:s0
 genfscon proc /net u:object_r:proc_net:s0
 genfscon proc /net/xt_qtaguid/ctrl u:object_r:qtaguid_proc:s0
+genfscon proc /net/xt_qtaguid/stats u:object_r:proc_net_xt_qtaguid_stats:s0
 genfscon proc /cpuinfo u:object_r:proc_cpuinfo:s0
 genfscon proc /pagetypeinfo u:object_r:proc_pagetypeinfo:s0
 genfscon proc /softirqs u:object_r:proc_timer:s0

public/domain.te

@@ -24,6 +24,10 @@ allow domain self:process {
 allow domain self:fd use;
 allow domain proc:dir r_dir_perms;
 allow domain proc_net:dir search;
+# STOPSHIP remove (b/70722355). This is granted temporarily to gather info
+# on uses of /proc/net/. /proc/net/xt_qtaguid/stats is broadly used including
+# by apps.
+allow domain proc_net_xt_qtaguid_stats:file r_file_perms;
 r_dir_file(domain, self)
 allow domain self:{ fifo_file file } rw_file_perms;
 allow domain self:unix_dgram_socket { create_socket_perms sendto };

public/file.te

@@ -33,6 +33,7 @@ type proc_misc, fs_type;
 type proc_modules, fs_type;
 type proc_mounts, fs_type;
 type proc_net, fs_type;
+type proc_net_xt_qtaguid_stats, fs_type;
 type proc_overflowuid, fs_type;
 type proc_page_cluster, fs_type;
 type proc_pagetypeinfo, fs_type;