Commit c34d4582 authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

unix_bind(): allocate addr earlier 



makes it easier to massage; we do pay for that by extra work
(kmalloc+memcpy+kfree) in some error cases, but those are not
on the hot paths anyway.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 185ab886

net/unix/af_unix.c

+15 −13
Original line number Diff line number Diff line
@@ -1040,6 +1040,15 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 
	if (err < 0)

		goto out;

	addr_len = err;

	err = -ENOMEM;

	addr = kmalloc(sizeof(*addr)+addr_len, GFP_KERNEL);

	if (!addr)

		goto out;



	memcpy(addr->name, sunaddr, addr_len);

	addr->len = addr_len;

	addr->hash = hash ^ sk->sk_type;

	refcount_set(&addr->refcnt, 1);



	if (sun_path[0]) {

		umode_t mode = S_IFSOCK |
@@ -1048,7 +1057,7 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 
		if (err) {

			if (err == -EEXIST)

				err = -EADDRINUSE;

			goto out;

			goto out_addr;

		}

	}
@@ -1060,16 +1069,6 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 
	if (u->addr)

		goto out_up;



	err = -ENOMEM;

	addr = kmalloc(sizeof(*addr)+addr_len, GFP_KERNEL);

	if (!addr)

		goto out_up;



	memcpy(addr->name, sunaddr, addr_len);

	addr->len = addr_len;

	addr->hash = hash ^ sk->sk_type;

	refcount_set(&addr->refcnt, 1);



	if (sun_path[0]) {

		addr->hash = UNIX_HASH_SIZE;

		hash = d_backing_inode(path.dentry)->i_ino & (UNIX_HASH_SIZE - 1);
@@ -1081,20 +1080,23 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 
		if (__unix_find_socket_byname(net, sunaddr, addr_len,

					      sk->sk_type, hash)) {

			spin_unlock(&unix_table_lock);

			unix_release_addr(addr);

			goto out_up;

		}

		hash = addr->hash;

	}



	err = 0;

	__unix_set_addr(sk, addr, hash);

	spin_unlock(&unix_table_lock);

	addr = NULL;

	err = 0;

out_up:

	mutex_unlock(&u->bindlock);

out_put:

	if (err)

		path_put(&path);

out_addr:

	if (addr)

		unix_release_addr(addr);

out:

	return err;

}