Commit 3be4aaf4 authored Apr 24, 2018 by Linus Torvalds

Merge branch 'userns-linus' of...

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.

parents 24cac700 1f578172

security/commoncap.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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);