diff options
| author | James Morris <james.morris@microsoft.com> | 2018-09-04 14:35:54 -0400 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-09-04 14:35:54 -0400 |
| commit | e42f6f9be4f83c537aa81b4c6239ea94ff5b29ce (patch) | |
| tree | f956a5ea0e83fc6d0df3e64681e7bbc1f201f3ee /security/commoncap.c | |
| parent | 4408e300a67ab2ce2505087986a9fe922c800ffd (diff) | |
| parent | 57361846b52bc686112da6ca5368d11210796804 (diff) | |
Merge tag 'v4.19-rc2' into next-general
Sync to Linux 4.19-rc2 for downstream developers.
Diffstat (limited to 'security/commoncap.c')
| -rw-r--r-- | security/commoncap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/commoncap.c b/security/commoncap.c index 6012f0cd8157..18a4fdf6f6eb 100644 --- a/security/commoncap.c +++ b/security/commoncap.c | |||
| @@ -388,7 +388,7 @@ int cap_inode_getsecurity(struct inode *inode, const char *name, void **buffer, | |||
| 388 | if (strcmp(name, "capability") != 0) | 388 | if (strcmp(name, "capability") != 0) |
| 389 | return -EOPNOTSUPP; | 389 | return -EOPNOTSUPP; |
| 390 | 390 | ||
| 391 | dentry = d_find_alias(inode); | 391 | dentry = d_find_any_alias(inode); |
| 392 | if (!dentry) | 392 | if (!dentry) |
| 393 | return -EINVAL; | 393 | return -EINVAL; |
| 394 | 394 | ||