Merge tag 'v3.10.55' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / security / commoncap.c

diff --git a/security/commoncap.c b/security/commoncap.c
index 5870fdc224b436d954f240a546b5398bbc3ce028..0405522995c5742c29d7c792bd9c17cefd40b795 100644 (file)
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -432,6 +432,9 @@ int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data
                cpu_caps->inheritable.cap[i] = le32_to_cpu(caps.data[i].inheritable);
        }
 
+       cpu_caps->permitted.cap[CAP_LAST_U32] &= CAP_LAST_U32_VALID_MASK;
+       cpu_caps->inheritable.cap[CAP_LAST_U32] &= CAP_LAST_U32_VALID_MASK;
+
        return 0;
 }