leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unix_bind_bsd(): move done_path_create() call after dealing with ->bindlock

Browse Source 
Final preparations for doing unlink on failure past the successful
mknod.  We can't hold ->bindlock over ->mknod() or ->unlink(), since
either might do sb_start_write() (e.g. on overlayfs).  However, we
can do it while holding filesystem and VFS locks - doing
	kern_path_create()
	vfs_mknod()
	grab ->bindlock
	if u->addr had been set
		drop ->bindlock
		done_path_create
		return -EINVAL
	else
		assign the address to socket
		drop ->bindlock
		done_path_create
		return 0
would be deadlock-free.  Here we massage unix_bind_bsd() to that
form.  We are still doing equivalent transformations.

Next commit will *not* be an equivalent transformation - it will
add a call of vfs_unlink() before done_path_create() in "alread bound"
case.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Al Viro 2021-06-19 03:50:31 +00:00 committed by David S. Miller
parent 71e6be6f7d
commit 56c1731b28
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
net/unix/af_unix.c
View File

@ -989,8 +989,8 @@ static int unix_bind_bsd(struct sock *sk, struct unix_address *addr)
struct unix_sock *u = unix_sk(sk); struct unix_sock *u = unix_sk(sk);
umode_t mode = S_IFSOCK | umode_t mode = S_IFSOCK |
(SOCK_INODE(sk->sk_socket)->i_mode & ~current_umask()); (SOCK_INODE(sk->sk_socket)->i_mode & ~current_umask());
struct path parent, path;
struct user_namespace *ns; // barf... struct user_namespace *ns; // barf...
struct path parent;
struct dentry *dentry; struct dentry *dentry;
unsigned int hash; unsigned int hash;
int err; int err;
@ -1008,36 +1008,32 @@ static int unix_bind_bsd(struct sock *sk, struct unix_address *addr)
* All right, let's create it. * All right, let's create it.
*/ */
err = security_path_mknod(&parent, dentry, mode, 0); err = security_path_mknod(&parent, dentry, mode, 0);
if (!err) { if (!err)
err = vfs_mknod(ns, d_inode(parent.dentry), dentry, mode, 0); err = vfs_mknod(ns, d_inode(parent.dentry), dentry, mode, 0);
if (!err) { if (err) {
path.mnt = mntget(parent.mnt); done_path_create(&parent, dentry);
path.dentry = dget(dentry);
}
}
done_path_create(&parent, dentry);
if (err)
return err; return err;
}
err = mutex_lock_interruptible(&u->bindlock); err = mutex_lock_interruptible(&u->bindlock);
if (err) { if (err) {
path_put(&path); done_path_create(&parent, dentry);
return err; return err;
} }
if (u->addr) { if (u->addr) {
mutex_unlock(&u->bindlock); mutex_unlock(&u->bindlock);
path_put(&path); done_path_create(&parent, dentry);
return -EINVAL; return -EINVAL;
} }
addr->hash = UNIX_HASH_SIZE; addr->hash = UNIX_HASH_SIZE;
hash = d_backing_inode(path.dentry)->i_ino & (UNIX_HASH_SIZE - 1); hash = d_backing_inode(dentry)->i_ino & (UNIX_HASH_SIZE - 1);
spin_lock(&unix_table_lock); spin_lock(&unix_table_lock);
u->path = path; u->path.mnt = mntget(parent.mnt);
u->path.dentry = dget(dentry);
__unix_set_addr(sk, addr, hash); __unix_set_addr(sk, addr, hash);
spin_unlock(&unix_table_lock); spin_unlock(&unix_table_lock);
mutex_unlock(&u->bindlock); mutex_unlock(&u->bindlock);
done_path_create(&parent, dentry);
return 0; return 0;
} }