diff options
| author | Kuniyuki Iwashima <kuniyu@amazon.com> | 2022-11-18 10:25:06 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-11-21 13:05:39 +0000 |
| commit | 7a7160edf1bfde25422262fb26851cef65f695d3 (patch) | |
| tree | fdc0257f0c6b52d6e30b8d9d6f4a694a21d467b8 /net/ipv6 | |
| parent | 1cb50726329070a6e3235b6bac38dfb8d5fd18c2 (diff) | |
| download | linux-stable-7a7160edf1bfde25422262fb26851cef65f695d3.tar.gz linux-stable-7a7160edf1bfde25422262fb26851cef65f695d3.tar.bz2 linux-stable-7a7160edf1bfde25422262fb26851cef65f695d3.zip | |
net: Return errno in sk->sk_prot->get_port().
We assume the correct errno is -EADDRINUSE when sk->sk_prot->get_port()
fails, so some ->get_port() functions return just 1 on failure and the
callers return -EADDRINUSE instead.
However, mptcp_get_port() can return -EINVAL. Let's not ignore the error.
Note the only exception is inet_autobind(), all of whose callers return
-EAGAIN instead.
Fixes: cec37a6e41aa ("mptcp: Handle MP_CAPABLE options for outgoing connections")
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/af_inet6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 68075295d587..fee9163382c2 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -410,10 +410,10 @@ static int __inet6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len, /* Make sure we are allowed to bind here. */ if (snum || !(inet->bind_address_no_port || (flags & BIND_FORCE_ADDRESS_NO_PORT))) { - if (sk->sk_prot->get_port(sk, snum)) { + err = sk->sk_prot->get_port(sk, snum); + if (err) { sk->sk_ipv6only = saved_ipv6only; inet_reset_saddr(sk); - err = -EADDRINUSE; goto out; } if (!(flags & BIND_FROM_BPF)) { |