mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-17 20:54:10 +00:00
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.
This commit is contained in:
commit
3be4aaf4e2
1 changed files with 2 additions and 0 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Reference in a new issue