From b6e4b35fe45279c57e7005169e995eec04df6667 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Fri, 21 Apr 2017 00:51:31 +0900 Subject: [PATCH] Revert "Make the xtables lock readable only by AID_RADIO and root." This reverts commit 5e801e7bd52d890583f44dffc41116c2dbc2a770. The file permissions don't allow access to the lock on devices where vendor code runs with UID root and GID radio. They are no longer necessary because we have a more flexible selinux-based solution in https://android-review.googlesource.com/#/c/354223/ . Test: strace -f -e flock -p on angler shows flock succeeds Test: strace -f -e flock -p on marlin shows flock succeeds Test: netd_unit_test passes on marlin Test: strace -f -e flock -p on marlin shows flock succeeds Bug: 36108349 Bug: 37483189 Change-Id: Ia1bbf8d93ec6777514be66cbd1a32dfc95df95c0 --- libcutils/fs_config.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libcutils/fs_config.c b/libcutils/fs_config.c index 5fc2386b7..6e5db0bc3 100644 --- a/libcutils/fs_config.c +++ b/libcutils/fs_config.c @@ -158,7 +158,6 @@ static const struct fs_path_config android_files[] = { { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/ppp/*" }, { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/rc.*" }, { 00440, AID_ROOT, AID_ROOT, 0, "system/etc/recovery.img" }, - { 00440, AID_RADIO, AID_ROOT, 0, "system/etc/xtables.lock" }, { 00600, AID_ROOT, AID_ROOT, 0, "vendor/build.prop" }, { 00600, AID_ROOT, AID_ROOT, 0, "vendor/default.prop" }, { 00444, AID_ROOT, AID_ROOT, 0, ven_conf_dir + 1 },