Merge branches 'acpi-scan', 'acpi-utils' and 'acpi-pm'

[mirror_ubuntu-artful-kernel.git] / security / commoncap.c

diff --git a/security/commoncap.c b/security/commoncap.c
index bab0611afc1eed309a04f9cf2ee05575ea98fc9d..2915d8503054c0e41e5bc4de2103f0dad4026371 100644 (file)
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -446,7 +446,7 @@ static int get_file_caps(struct linux_binprm *bprm, bool *effective, bool *has_c
        if (bprm->file->f_path.mnt->mnt_flags & MNT_NOSUID)
                return 0;
 
-       dentry = dget(bprm->file->f_dentry);
+       dentry = dget(bprm->file->f_path.dentry);
 
        rc = get_vfs_caps_from_disk(dentry, &vcaps);
        if (rc < 0) {