commit 18ccf9725e4ffa15581576e1fa965c31b95f6666
author Bram Bonné <brambonne@google.com> Mon Nov 16 10:19:34 2020 +0000
committer Bram Bonné <brambonne@google.com> Mon Nov 16 12:55:39 2020 +0000
tree f72511772dcb7f6dfc9418b2f42f6bcc8184bf7c
parent f48d1f8e468ee5ba012304adb7b13b77c848e030

Revert^2 "Enforce RTM_GETLINK restrictions on all 3p apps"

f48d1f8e468ee5ba012304adb7b13b77c848e030

The original change was reverted due to InterfaceParamsTest failing.
This test has now been fixed in r.android.com/1498525.
The original change message is below.

This restriction was previously targetSdk gated for apps
with targetSdkVersion>=30.

This change is being posted for app-compat analysis and testing.

Bug: 170188668
Test: build

Change-Id: I320d3bcf8bb64badc39688b19902d532c802dc75

private/app_neverallows.te

diff --git a/private/app_neverallows.te b/private/app_neverallows.te
index 12357c7..87869dd 100644
--- a/private/app_neverallows.te
+++ b/private/app_neverallows.te
@@ -114,12 +114,7 @@
 } *;
 
 # Disallow sending RTM_GETLINK messages on netlink sockets.
-neverallow {
-  all_untrusted_apps
-  -untrusted_app_25
-  -untrusted_app_27
-  -untrusted_app_29
-} domain:netlink_route_socket { bind nlmsg_readpriv };
+neverallow all_untrusted_apps domain:netlink_route_socket { bind nlmsg_readpriv };
 
 # Do not allow untrusted apps access to /cache
 neverallow { all_untrusted_apps -mediaprovider } { cache_file cache_recovery_file }:dir ~{ r_dir_perms };

private/untrusted_app_25.te

diff --git a/private/untrusted_app_25.te b/private/untrusted_app_25.te
index a1abc41..82c07ff 100644
--- a/private/untrusted_app_25.te
+++ b/private/untrusted_app_25.te
@@ -48,6 +48,3 @@
 
 # Read /mnt/sdcard symlink.
 allow untrusted_app_25 mnt_sdcard_file:lnk_file r_file_perms;
-
-# allow binding to netlink route sockets and sending RTM_GETLINK messages.
-allow untrusted_app_25 self:netlink_route_socket { bind nlmsg_readpriv };

private/untrusted_app_27.te

diff --git a/private/untrusted_app_27.te b/private/untrusted_app_27.te
index b7b6d72..7a326a5 100644
--- a/private/untrusted_app_27.te
+++ b/private/untrusted_app_27.te
@@ -36,6 +36,3 @@
 
 # Read /mnt/sdcard symlink.
 allow untrusted_app_27 mnt_sdcard_file:lnk_file r_file_perms;
-
-# allow binding to netlink route sockets and sending RTM_GETLINK messages.
-allow untrusted_app_27 self:netlink_route_socket { bind nlmsg_readpriv };

private/untrusted_app_29.te

diff --git a/private/untrusted_app_29.te b/private/untrusted_app_29.te
index 344ae89..d03f399 100644
--- a/private/untrusted_app_29.te
+++ b/private/untrusted_app_29.te
@@ -14,6 +14,3 @@
 untrusted_app_domain(untrusted_app_29)
 net_domain(untrusted_app_29)
 bluetooth_domain(untrusted_app_29)
-
-# allow binding to netlink route sockets and sending RTM_GETLINK messages.
-allow untrusted_app_29 self:netlink_route_socket { bind nlmsg_readpriv };