dlm: use kernel_connect() and kernel_bind()

commit e9cdebbe23f1aa9a1caea169862f479ab3fa2773 upstream.

Recent changes to kernel_connect() and kernel_bind() ensure that
callers are insulated from changes to the address parameter made by BPF
SOCK_ADDR hooks. This patch wraps direct calls to ops->connect() and
ops->bind() with kernel_connect() and kernel_bind() to protect callers
in such cases.

Link: https://lore.kernel.org/netdev/9944248dba1bce861375fcce9de663934d933ba9.camel@redhat.com/
Fixes: d74bad4e74ee ("bpf: Hooks for sys_connect")
Fixes: 4fbac77d2d09 ("bpf: Hooks for sys_bind")
Cc: stable@vger.kernel.org
Signed-off-by: Jordan Rife <jrife@google.com>
Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index f7bc22e..32dbd1a 100644 (file)
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -1805,8 +1805,8 @@ static int dlm_tcp_bind(struct socket *sock)
        memcpy(&src_addr, &dlm_local_addr[0], sizeof(src_addr));
        make_sockaddr(&src_addr, 0, &addr_len);
 
-       result = sock->ops->bind(sock, (struct sockaddr *)&src_addr,
-                                addr_len);
+       result = kernel_bind(sock, (struct sockaddr *)&src_addr,
+                            addr_len);
        if (result < 0) {
                /* This *may* not indicate a critical error */
                log_print("could not bind for connect: %d", result);
@@ -1818,7 +1818,7 @@ static int dlm_tcp_bind(struct socket *sock)
 static int dlm_tcp_connect(struct connection *con, struct socket *sock,
                           struct sockaddr *addr, int addr_len)
 {
-       return sock->ops->connect(sock, addr, addr_len, O_NONBLOCK);
+       return kernel_connect(sock, addr, addr_len, O_NONBLOCK);
 }
 
 static int dlm_tcp_listen_validate(void)
@@ -1850,8 +1850,8 @@ static int dlm_tcp_listen_bind(struct socket *sock)
 
        /* Bind to our port */
        make_sockaddr(&dlm_local_addr[0], dlm_config.ci_tcp_port, &addr_len);
-       return sock->ops->bind(sock, (struct sockaddr *)&dlm_local_addr[0],
-                              addr_len);
+       return kernel_bind(sock, (struct sockaddr *)&dlm_local_addr[0],
+                          addr_len);
 }
 
 static const struct dlm_proto_ops dlm_tcp_ops = {
@@ -1876,12 +1876,12 @@ static int dlm_sctp_connect(struct connection *con, struct socket *sock,
        int ret;
 
        /*
-        * Make sock->ops->connect() function return in specified time,
+        * Make kernel_connect() function return in specified time,
         * since O_NONBLOCK argument in connect() function does not work here,
         * then, we should restore the default value of this attribute.
         */
        sock_set_sndtimeo(sock->sk, 5);
-       ret = sock->ops->connect(sock, addr, addr_len, 0);
+       ret = kernel_connect(sock, addr, addr_len, 0);
        sock_set_sndtimeo(sock->sk, 0);
        return ret;
 }