system_server: add CAP_SYS_PTRACE
Commit https://android.googlesource.com/kernel/common/+/f0ce0eee added
CAP_SYS_RESOURCE as a capability check which would allow access to
sensitive /proc/PID files. system_server uses this capability to collect
smaps from managed processes. Presumably this was done to avoid the
implications of granting CAP_SYS_PTRACE to system_server.
However, with SELinux enforcement, we can grant CAP_SYS_PTRACE but not
allow ptrace attach() to other processes. The net result of this is that
CAP_SYS_PTRACE and CAP_SYS_RESOURCE have identical security controls, as
long as system_server:process ptrace is never granted.
Add CAP_SYS_PTRACE to the set of capabilities granted to system_server.
Don't delete CAP_SYS_RESOURCE for now. SELinux has blocked the use of
CAP_SYS_RESOURCE, but we still want to generate audit logs if it's
triggered. CAP_SYS_RESOURCE can be deleted in a future commit.
Bug: 34951864
Bug: 38496951
Test: Device boots, functionality remains identical, no sys_resource
denials from system_server.
Change-Id: I2570266165396dba2b600eac7c42c94800d9c65b
(cherry picked from commit 3082eb7c72)
This commit is contained in:
committed by
JP Sugarbroad
parent
1d8eb49073
commit
966619d0ab
@@ -580,6 +580,7 @@ public class ZygoteInit {
|
||||
OsConstants.CAP_NET_RAW,
|
||||
OsConstants.CAP_SYS_MODULE,
|
||||
OsConstants.CAP_SYS_NICE,
|
||||
OsConstants.CAP_SYS_PTRACE,
|
||||
OsConstants.CAP_SYS_RESOURCE,
|
||||
OsConstants.CAP_SYS_TIME,
|
||||
OsConstants.CAP_SYS_TTY_CONFIG
|
||||
|
||||
Reference in New Issue
Block a user