From: Kuniyuki Iwashima <kuniyu@amazon.co.jp>
Date: Wed, 24 Nov 2021 11:14:22 +0900
Subject: af_unix: Return an error as a pointer in unix_find_other().
Patch-mainline: v5.17-rc1
Git-commit: aed26f557bbc94f0c778f63d7dfe86af99208f68
References: jsc#PED-1377
We can return an error as a pointer and need not pass an additional
argument to unix_find_other().
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.co.jp>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Acked-by: Shung-Hsi Yu <shung-hsi.yu@suse.com>
---
net/unix/af_unix.c | 40 ++++++++++++++++++++++------------------
1 file changed, 22 insertions(+), 18 deletions(-)
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -915,7 +915,7 @@ static int unix_release(struct socket *s
}
static struct sock *unix_find_bsd(struct net *net, struct sockaddr_un *sunaddr,
- int type, int *error)
+ int type)
{
struct inode *inode;
struct path path;
@@ -954,23 +954,20 @@ sock_put:
path_put:
path_put(&path);
fail:
- *error = err;
- return NULL;
+ return ERR_PTR(err);
}
static struct sock *unix_find_abstract(struct net *net,
struct sockaddr_un *sunaddr,
int addr_len, int type,
- unsigned int hash, int *error)
+ unsigned int hash)
{
struct dentry *dentry;
struct sock *sk;
sk = unix_find_socket_byname(net, sunaddr, addr_len, type ^ hash);
- if (!sk) {
- *error = -ECONNREFUSED;
- return NULL;
- }
+ if (!sk)
+ return ERR_PTR(-ECONNREFUSED);
dentry = unix_sk(sk)->path.dentry;
if (dentry)
@@ -982,15 +979,14 @@ static struct sock *unix_find_abstract(s
static struct sock *unix_find_other(struct net *net,
struct sockaddr_un *sunaddr,
int addr_len, int type,
- unsigned int hash, int *error)
+ unsigned int hash)
{
struct sock *sk;
if (sunaddr->sun_path[0])
- sk = unix_find_bsd(net, sunaddr, type, error);
+ sk = unix_find_bsd(net, sunaddr, type);
else
- sk = unix_find_abstract(net, sunaddr, addr_len, type, hash,
- error);
+ sk = unix_find_abstract(net, sunaddr, addr_len, type, hash);
return sk;
}
@@ -1227,9 +1223,11 @@ static int unix_dgram_connect(struct soc
}
restart:
- other = unix_find_other(net, sunaddr, alen, sock->type, hash, &err);
- if (!other)
+ other = unix_find_other(net, sunaddr, alen, sock->type, hash);
+ if (IS_ERR(other)) {
+ err = PTR_ERR(other);
goto out;
+ }
unix_state_double_lock(sk, other);
@@ -1354,9 +1352,12 @@ static int unix_stream_connect(struct so
restart:
/* Find listening sock. */
- other = unix_find_other(net, sunaddr, addr_len, sk->sk_type, hash, &err);
- if (!other)
+ other = unix_find_other(net, sunaddr, addr_len, sk->sk_type, hash);
+ if (IS_ERR(other)) {
+ err = PTR_ERR(other);
+ other = NULL;
goto out;
+ }
/* Latch state of peer */
unix_state_lock(other);
@@ -1825,9 +1826,12 @@ restart:
goto out_free;
other = unix_find_other(net, sunaddr, namelen, sk->sk_type,
- hash, &err);
- if (other == NULL)
+ hash);
+ if (IS_ERR(other)) {
+ err = PTR_ERR(other);
+ other = NULL;
goto out_free;
+ }
}
if (sk_filter(other, skb) < 0) {