mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-27 12:57:53 +00:00
Code Issues Releases Wiki Activity

fold unix_mknod() into unix_bind_bsd()

Browse source 
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:30 +00:00 committed by David S. Miller
parent fa42d910a3
commit 71e6be6f7d
1 changed files with 17 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
net/unix/af_unix.c
View file

@ -984,46 +984,38 @@ static struct sock *unix_find_other(struct net *net,
return NULL;
}
static int unix_mknod(const char *sun_path, umode_t mode, struct path *res)
static int unix_bind_bsd(struct sock *sk, struct unix_address *addr)
{
struct unix_sock *u = unix_sk(sk);
umode_t mode = S_IFSOCK |
(SOCK_INODE(sk->sk_socket)->i_mode & ~current_umask());
struct path parent, path;
struct user_namespace *ns; // barf...
struct dentry *dentry;
struct path path;
int err = 0;
unsigned int hash;
int err;
/*
* Get the parent directory, calculate the hash for last
* component.
*/
dentry = kern_path_create(AT_FDCWD, sun_path, &path, 0);
err = PTR_ERR(dentry);
dentry = kern_path_create(AT_FDCWD, addr->name->sun_path, &parent, 0);
if (IS_ERR(dentry))
return err;
return PTR_ERR(dentry);
ns = mnt_user_ns(parent.mnt);
/*
* All right, let's create it.
*/
err = security_path_mknod(&path, dentry, mode, 0);
err = security_path_mknod(&parent, dentry, mode, 0);
if (!err) {
err = vfs_mknod(mnt_user_ns(path.mnt), d_inode(path.dentry),
dentry, mode, 0);
err = vfs_mknod(ns, d_inode(parent.dentry), dentry, mode, 0);
if (!err) {
res->mnt = mntget(path.mnt);
res->dentry = dget(dentry);
path.mnt = mntget(parent.mnt);
path.dentry = dget(dentry);
}
}
done_path_create(&path, dentry);
return err;
}
static int unix_bind_bsd(struct sock *sk, struct unix_address *addr)
{
struct unix_sock *u = unix_sk(sk);
struct path path = { };
umode_t mode = S_IFSOCK |
(SOCK_INODE(sk->sk_socket)->i_mode & ~current_umask());
unsigned int hash;
int err;
err = unix_mknod(addr->name->sun_path, mode, &path);
done_path_create(&parent, dentry);
if (err)
return err;