commit d8e8197b93fb45a6459ca0ec0d462ce29e63de6a
author Tim Detwiler <tjdetwiler@google.com> Mon Oct 22 09:57:20 2018 -0700
committer Tim Detwiler <tjdetwiler@google.com> Mon Oct 22 13:17:46 2018 -0700
tree 16a75ec87237f69834600d617298b9de205729af
parent caf535349bc4d71a6645b23f097f48c5ebe58b90

Revert "vfs: Allow userns root to call mknod on owned filesystems."

This causes issues for unprivileged containers. This should be
re-applied once the container daemon has been updated to be compatible.

This reverts commit 55956b59df336f6738da916dbb520b6e37df9fbd.

Change-Id: Ib89b0748257ecc0305034425514abd9d83b27933

fs/namei.c

diff --git a/fs/namei.c b/fs/namei.c
index 734cef5..389e48e 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3711,8 +3711,7 @@
 	if (error)
 		return error;
 
-	if ((S_ISCHR(mode) || S_ISBLK(mode)) &&
-	    !ns_capable(dentry->d_sb->s_user_ns, CAP_MKNOD))
+	if ((S_ISCHR(mode) || S_ISBLK(mode)) && !capable(CAP_MKNOD))
 		return -EPERM;
 
 	if (!dir->i_op->mknod)