diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-24 18:25:39 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-24 18:25:39 +0200 |
| commit | 4def1963608ed2b61aca5b52fdedb4ca2798820c (patch) | |
| tree | 83b36e8ff3c5eabe0d235f863adcf54f838f838a /security | |
| parent | Merge tag 'drm-next-2018-08-24' of git://anongit.freedesktop.org/drm/drm (diff) | |
| parent | getxattr: use correct xattr length (diff) | |
| download | linux-4def1963608ed2b61aca5b52fdedb4ca2798820c.tar.xz linux-4def1963608ed2b61aca5b52fdedb4ca2798820c.zip | |
Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull namespace fixes from Eric Biederman:
"This is a set of four fairly obvious bug fixes:
- a switch from d_find_alias to d_find_any_alias because the xattr
code perversely takes a dentry
- two mutex vs copy_to_user fixes from Jann Horn
- a fix to use a sanitized size not the size userspace passed in from
Christian Brauner"
* 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
getxattr: use correct xattr length
sys: don't hold uts_sem while accessing userspace memory
userns: move user access out of the mutex
cap_inode_getsecurity: use d_find_any_alias() instead of d_find_alias()
Diffstat (limited to 'security')
| -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 f4c33abd9959..2e489d6a3ac8 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, if (strcmp(name, "capability") != 0) return -EOPNOTSUPP; - dentry = d_find_alias(inode); + dentry = d_find_any_alias(inode); if (!dentry) return -EINVAL; |