Commit a707b577 authored by Jordan Rife's avatar Jordan Rife Committed by sanglipeng
Browse files

net: replace calls to sock->ops->connect() with kernel_connect() 

stable inclusion
from stable-v5.10.198
commit 72fc02ebfc93dc818da3fd1cd4c9fb03fd199c9d
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I987V5

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=72fc02ebfc93dc818da3fd1cd4c9fb03fd199c9d

--------------------------------

commit 26297b4c upstream.

commit 0bdf3993 ("net: Avoid address overwrite in kernel_connect")
ensured that kernel_connect() will not overwrite the address parameter
in cases where BPF connect hooks perform an address rewrite. This change
replaces direct calls to sock->ops->connect() in net with kernel_connect()
to make these call safe.

Link: https://lore.kernel.org/netdev/20230912013332.2048422-1-jrife@google.com/


Fixes: d74bad4e ("bpf: Hooks for sys_connect")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarJordan Rife <jrife@google.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 0c1e009c

net/netfilter/ipvs/ip_vs_sync.c

+2 −2
Original line number Diff line number Diff line
@@ -1507,7 +1507,7 @@ static int make_send_sock(struct netns_ipvs *ipvs, int id, 
	}



	get_mcast_sockaddr(&mcast_addr, &salen, &ipvs->mcfg, id);

	result = sock->ops->connect(sock, (struct sockaddr *) &mcast_addr,

	result = kernel_connect(sock, (struct sockaddr *)&mcast_addr,

				salen, 0);

	if (result < 0) {

		pr_err("Error connecting to the multicast addr\n");

net/rds/tcp_connect.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ int rds_tcp_conn_path_connect(struct rds_conn_path *cp) 
	 * own the socket

	 */

	rds_tcp_set_callbacks(sock, cp);

	ret = sock->ops->connect(sock, addr, addrlen, O_NONBLOCK);

	ret = kernel_connect(sock, addr, addrlen, O_NONBLOCK);



	rdsdebug("connect to address %pI6c returned %d\n", &conn->c_faddr, ret);

	if (ret == -EINPROGRESS)