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

__unix_find_socket_byname(): don't pass hash and type separately

Browse Source 
We only care about exclusive or of those, so pass that directly.
Makes life simpler for callers as well...

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:33 +00:00 committed by David S. Miller
parent c0c3b8d380
commit be752283a2
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
net/unix/af_unix.c
View File

@ -286,11 +286,11 @@ static inline void unix_insert_socket(struct hlist_head *list, struct sock *sk)
static struct sock *__unix_find_socket_byname(struct net *net, static struct sock *__unix_find_socket_byname(struct net *net,
struct sockaddr_un *sunname, struct sockaddr_un *sunname,
int len, int type, unsigned int hash) int len, unsigned int hash)
{ {
struct sock *s; struct sock *s;
sk_for_each(s, &unix_socket_table[hash ^ type]) { sk_for_each(s, &unix_socket_table[hash]) {
struct unix_sock *u = unix_sk(s); struct unix_sock *u = unix_sk(s);
if (!net_eq(sock_net(s), net)) if (!net_eq(sock_net(s), net))
@ -305,13 +305,12 @@ static struct sock *__unix_find_socket_byname(struct net *net,
static inline struct sock *unix_find_socket_byname(struct net *net, static inline struct sock *unix_find_socket_byname(struct net *net,
struct sockaddr_un *sunname, struct sockaddr_un *sunname,
int len, int type, int len, unsigned int hash)
unsigned int hash)
{ {
struct sock *s; struct sock *s;
spin_lock(&unix_table_lock); spin_lock(&unix_table_lock);
s = __unix_find_socket_byname(net, sunname, len, type, hash); s = __unix_find_socket_byname(net, sunname, len, hash);
if (s) if (s)
sock_hold(s); sock_hold(s);
spin_unlock(&unix_table_lock); spin_unlock(&unix_table_lock);
@ -899,12 +898,12 @@ static int unix_autobind(struct socket *sock)
retry: retry:
addr->len = sprintf(addr->name->sun_path+1, "%05x", ordernum) + 1 + sizeof(short); addr->len = sprintf(addr->name->sun_path+1, "%05x", ordernum) + 1 + sizeof(short);
addr->hash = unix_hash_fold(csum_partial(addr->name, addr->len, 0)); addr->hash = unix_hash_fold(csum_partial(addr->name, addr->len, 0));
addr->hash ^= sk->sk_type;
spin_lock(&unix_table_lock); spin_lock(&unix_table_lock);
ordernum = (ordernum+1)&0xFFFFF; ordernum = (ordernum+1)&0xFFFFF;
if (__unix_find_socket_byname(net, addr->name, addr->len, sock->type, if (__unix_find_socket_byname(net, addr->name, addr->len, addr->hash)) {
addr->hash)) {
spin_unlock(&unix_table_lock); spin_unlock(&unix_table_lock);
/* /*
* __unix_find_socket_byname() may take long time if many names * __unix_find_socket_byname() may take long time if many names
@ -919,7 +918,6 @@ retry:
} }
goto retry; goto retry;
} }
addr->hash ^= sk->sk_type;
__unix_set_addr(sk, addr, addr->hash); __unix_set_addr(sk, addr, addr->hash);
spin_unlock(&unix_table_lock); spin_unlock(&unix_table_lock);
@ -966,7 +964,7 @@ static struct sock *unix_find_other(struct net *net,
} }
} else { } else {
err = -ECONNREFUSED; err = -ECONNREFUSED;
u = unix_find_socket_byname(net, sunname, len, type, hash); u = unix_find_socket_byname(net, sunname, len, type ^ hash);
if (u) { if (u) {
struct dentry *dentry; struct dentry *dentry;
dentry = unix_sk(u)->path.dentry; dentry = unix_sk(u)->path.dentry;
@ -1040,8 +1038,7 @@ out:
return err; return err;
} }
static int unix_bind_abstract(struct sock *sk, unsigned hash, static int unix_bind_abstract(struct sock *sk, struct unix_address *addr)
struct unix_address *addr)
{ {
struct unix_sock *u = unix_sk(sk); struct unix_sock *u = unix_sk(sk);
int err; int err;
@ -1057,7 +1054,7 @@ static int unix_bind_abstract(struct sock *sk, unsigned hash,
spin_lock(&unix_table_lock); spin_lock(&unix_table_lock);
if (__unix_find_socket_byname(sock_net(sk), addr->name, addr->len, if (__unix_find_socket_byname(sock_net(sk), addr->name, addr->len,
sk->sk_type, hash)) { addr->hash)) {
spin_unlock(&unix_table_lock); spin_unlock(&unix_table_lock);
mutex_unlock(&u->bindlock); mutex_unlock(&u->bindlock);
return -EADDRINUSE; return -EADDRINUSE;
@ -1100,7 +1097,7 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
if (sun_path[0]) if (sun_path[0])
err = unix_bind_bsd(sk, addr); err = unix_bind_bsd(sk, addr);
else else
err = unix_bind_abstract(sk, hash, addr); err = unix_bind_abstract(sk, addr);
if (err) if (err)
unix_release_addr(addr); unix_release_addr(addr);
return err == -EEXIST ? -EADDRINUSE : err; return err == -EEXIST ? -EADDRINUSE : err;