diff options
| author | Nick Kralevich <nnk@google.com> | 2017-11-28 01:29:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-11-28 01:29:01 +0000 |
| commit | bebe277cbbf42304fb0143633a005f7e8681bba7 (patch) | |
| tree | 8868b744dc7a85eab806d2bc0a4148945fcdf641 | |
| parent | 8042c5929a77715a92b0b3ace7b348ea3f5d7f50 (diff) | |
| parent | c1a5a9b1ab432490f3282208e947d0c8917580ef (diff) | |
| download | e2fsprogs-bebe277cbbf42304fb0143633a005f7e8681bba7.tar.gz | |
Merge "Standarize on VFS_CAP_REVISION_2" am: 6428ed2f85 am: f99800d245
am: c1a5a9b1ab
Change-Id: I292057cb00e691aec14e67527cb9e2068d29169d
| -rw-r--r-- | contrib/android/perms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/android/perms.c b/contrib/android/perms.c index 422a0d16..d83ad35a 100644 --- a/contrib/android/perms.c +++ b/contrib/android/perms.c @@ -131,7 +131,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, |