Commit 3be4aaf4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'userns-linus' of...

Merge branch 'userns-linus' of git://

Pull userns bug fix from Eric Biederman:
 "Just a small fix to properly set the return code on error"

* 'userns-linus' of git://
  commoncap: Handle memory allocation failure.
parents 24cac700 1f578172
......@@ -449,6 +449,8 @@ int cap_inode_getsecurity(struct inode *inode, const char *name, void **buffer,
memcpy(&cap->data, &nscap->data, sizeof(__le32) * 2 * VFS_CAP_U32);
cap->magic_etc = cpu_to_le32(magic);
} else {
size = -ENOMEM;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment