AOSP: Standarize on VFS_CAP_REVISION_2

In https://github.com/torvalds/linux/commit/8db6c34f1dbc8 , namespaced
file capabilities were introduced. That change updated VFS_CAP_REVISION
from VFS_CAP_REVISION_2 to VFS_CAP_REVISION_3.

Android code is written assuming v2 capabilities, and the code will
break if we naively try to treat a v2 structure as a v3 structure.
So don't even try.

Android kernels prior to v4.14 will not support this extended capability
structure, so attempting to set such capabilities will ultimately fail.

With 8db6c34f1dbc8, it appears that attempting to read a v3 capabilities
xattr will always downgrade the capability to a v2 capability, so it
really doesn't make sense to look for a v3 capability.

Android capabilities are only created at /system and /vendor filesystem
creation time by host tools. Android processes, within or outside a
namespace, are not permitted CAP_SETFCAP
(https://android-review.googlesource.com/c/platform/system/sepolicy/+/547801/1/public/domain.te
line 1101). So we should never have to deal with a v3 capability other
than those that might appear on the /system / /vendor partition at a
future date by a future author.

Bug: 69617725
Test: build/test/boot/CTS passes
Change-Id: I7f9ed62b0a539f705d697113d007f0e7379221ea
From AOSP commit: b256c96940e8e709456f0dc29cce5bf8285f687d

diff --git a/contrib/android/perms.c b/contrib/android/perms.c
index dde90d96f6d2dcb26c54e670394ba4ac592e048f..e67aa1ef6ca14060272c29089c846beb53370c2c 100644 (file)
--- a/contrib/android/perms.c
+++ b/contrib/android/perms.c
@@ -125,7 +125,7 @@ static errcode_t set_perms_and_caps(ext2_filsys fs, ext2_ino_t ino,
        if (!capabilities)
                return 0;
        memset(&cap_data, 0, sizeof(cap_data));
-       cap_data.magic_etc = VFS_CAP_REVISION | VFS_CAP_FLAGS_EFFECTIVE;
+       cap_data.magic_etc = VFS_CAP_REVISION_2 | VFS_CAP_FLAGS_EFFECTIVE;
        cap_data.data[0].permitted = (uint32_t) (capabilities & 0xffffffff);
        cap_data.data[1].permitted = (uint32_t) (capabilities >> 32);
        return ino_add_xattr(fs, ino,  "security." XATTR_CAPS_SUFFIX,