Merge tag 'v3.10.60' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / kernel / capability.c

diff --git a/kernel/capability.c b/kernel/capability.c
index d52eecc0942b0eacc20ef0a7e6bf277d31e87a8f..1339806a87312f175a2a19fd99751f949dc9917c 100644 (file)
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -268,6 +268,10 @@ SYSCALL_DEFINE2(capset, cap_user_header_t, header, const cap_user_data_t, data)
                i++;
        }
 
+       effective.cap[CAP_LAST_U32] &= CAP_LAST_U32_VALID_MASK;
+       permitted.cap[CAP_LAST_U32] &= CAP_LAST_U32_VALID_MASK;
+       inheritable.cap[CAP_LAST_U32] &= CAP_LAST_U32_VALID_MASK;
+
        new = prepare_creds();
        if (!new)
                return -ENOMEM;