mptcp: mptcp: avoid additional indirection in mptcp_bind()

We are going to remove the first subflow socket soon, so avoid
the additional indirection via at bind() time. Instead call directly
the recently introduced helpers on the first subflow sock.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 891f49722263f4271c215d9981af261cd6a3611c..5b4d6f0628a7ef674a39e853fb602b256b3995cf 100644 (file)
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -3689,22 +3689,29 @@ static struct proto mptcp_prot = {
 static int mptcp_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
 {
        struct mptcp_sock *msk = mptcp_sk(sock->sk);
+       struct sock *ssk, *sk = sock->sk;
        struct socket *ssock;
-       int err;
+       int err = -EINVAL;
 
-       lock_sock(sock->sk);
+       lock_sock(sk);
        ssock = __mptcp_nmpc_socket(msk);
        if (IS_ERR(ssock)) {
                err = PTR_ERR(ssock);
                goto unlock;
        }
 
-       err = READ_ONCE(ssock->ops)->bind(ssock, uaddr, addr_len);
+       ssk = msk->first;
+       if (sk->sk_family == AF_INET)
+               err = inet_bind_sk(ssk, uaddr, addr_len);
+#if IS_ENABLED(CONFIG_MPTCP_IPV6)
+       else if (sk->sk_family == AF_INET6)
+               err = inet6_bind_sk(ssk, uaddr, addr_len);
+#endif
        if (!err)
-               mptcp_copy_inaddrs(sock->sk, ssock->sk);
+               mptcp_copy_inaddrs(sk, ssk);
 
 unlock:
-       release_sock(sock->sk);
+       release_sock(sk);
        return err;
 }