diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-24 17:58:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-24 17:58:51 -0700 |
| commit | 3be4aaf4e2d3eb95cce7835e8df797ae65ae5ac1 (patch) | |
| tree | 3238bb369bdcadc8dec4d7fd31fdf36b733aeb21 /security | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | commoncap: Handle memory allocation failure. (diff) | |
| download | linux-dev-3be4aaf4e2d3eb95cce7835e8df797ae65ae5ac1.tar.xz linux-dev-3be4aaf4e2d3eb95cce7835e8df797ae65ae5ac1.zip | |
Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull userns bug fix from Eric Biederman:
"Just a small fix to properly set the return code on error"
* 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
commoncap: Handle memory allocation failure.
Diffstat (limited to 'security')
| -rw-r--r-- | security/commoncap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/security/commoncap.c b/security/commoncap.c index 48620c93d697..1ce701fcb3f3 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -449,6 +449,8 @@ int cap_inode_getsecurity(struct inode *inode, const char *name, void **buffer, magic |= VFS_CAP_FLAGS_EFFECTIVE; memcpy(&cap->data, &nscap->data, sizeof(__le32) * 2 * VFS_CAP_U32); cap->magic_etc = cpu_to_le32(magic); + } else { + size = -ENOMEM; } } kfree(tmpbuf); |