[v6,17/40] af_unix: handle idmapped mounts

Commit Message

Christian Brauner Jan. 21, 2021, 1:19 p.m. UTC

When binding a non-abstract AF_UNIX socket it will gain a representation
in the filesystem. Enable the socket infrastructure to handle idmapped
mounts by passing down the user namespace of the mount the socket will
be created from. If the initial user namespace is passed nothing changes
so non-idmapped mounts will see identical behavior as before.

Link: https://lore.kernel.org/r/[e-mail]
Cc: Christoph Hellwig <[e-mail]>
Cc: David Howells <[e-mail]>
Cc: Al Viro <[e-mail]>
Cc: [e-mail]
Reviewed-by: Christoph Hellwig <[e-mail]>
Signed-off-by: Christian Brauner <[e-mail]>
---
/* v2 */
unchanged

/* v3 */
unchanged

/* v4 */
unchanged

/* v5 */
unchanged
base-commit: 7c53f6b671f4aba70ff15e1b05148b10d58c2837

/* v6 */
unchanged
base-commit: 19c329f6808995b142b3966301f217c831e7cf31
---
 net/unix/af_unix.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

James Morris Jan. 22, 2021, 4:14 a.m. UTC | #1

On Thu, 21 Jan 2021, Christian Brauner wrote:

> When binding a non-abstract AF_UNIX socket it will gain a representation
> in the filesystem. Enable the socket infrastructure to handle idmapped
> mounts by passing down the user namespace of the mount the socket will
> be created from. If the initial user namespace is passed nothing changes
> so non-idmapped mounts will see identical behavior as before.
> 
> Link: https://lore.kernel.org/r/[e-mail]
> Cc: Christoph Hellwig <[e-mail]>
> Cc: David Howells <[e-mail]>
> Cc: Al Viro <[e-mail]>
> Cc: [e-mail]
> Reviewed-by: Christoph Hellwig <[e-mail]>
> Signed-off-by: Christian Brauner <[e-mail]>


Reviewed-by: James Morris <[e-mail]>

Patch

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 9a1f3c04402e..5a31307ceb76 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -996,8 +996,8 @@  static int unix_mknod(const char *sun_path, umode_t mode, struct path *res)
 	 */
 	err = security_path_mknod(&path, dentry, mode, 0);
 	if (!err) {
-		err = vfs_mknod(&init_user_ns, d_inode(path.dentry), dentry,
-				mode, 0);
+		err = vfs_mknod(mnt_user_ns(path.mnt), d_inode(path.dentry),
+				dentry, mode, 0);
 		if (!err) {
 			res->mnt = mntget(path.mnt);
 			res->dentry = dget(dentry);