Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: prevent address rewrite in kernel_bind()

Similar to the change in commit 0bdf399342c5("net: Avoid address
overwrite in kernel_connect"), BPF hooks run on bind may rewrite the
address passed to kernel_bind(). This change

1) Makes a copy of the bind address in kernel_bind() to insulate
callers.
2) Replaces direct calls to sock->ops->bind() in net with kernel_bind()

Link: https://lore.kernel.org/netdev/20230912013332.2048422-1-jrife@google.com/
Fixes: 4fbac77d2d09 ("bpf: Hooks for sys_bind")
Cc: stable@vger.kernel.org
Reviewed-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: Jordan Rife <jrife@google.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Jordan Rife and committed by
David S. Miller
c889a99a 86a7e0b6

+10 -5
+2 -2
net/netfilter/ipvs/ip_vs_sync.c
··· 1439 1439 sin.sin_addr.s_addr = addr; 1440 1440 sin.sin_port = 0; 1441 1441 1442 - return sock->ops->bind(sock, (struct sockaddr*)&sin, sizeof(sin)); 1442 + return kernel_bind(sock, (struct sockaddr *)&sin, sizeof(sin)); 1443 1443 } 1444 1444 1445 1445 static void get_mcast_sockaddr(union ipvs_sockaddr *sa, int *salen, ··· 1546 1546 1547 1547 get_mcast_sockaddr(&mcast_addr, &salen, &ipvs->bcfg, id); 1548 1548 sock->sk->sk_bound_dev_if = dev->ifindex; 1549 - result = sock->ops->bind(sock, (struct sockaddr *)&mcast_addr, salen); 1549 + result = kernel_bind(sock, (struct sockaddr *)&mcast_addr, salen); 1550 1550 if (result < 0) { 1551 1551 pr_err("Error binding to the multicast addr\n"); 1552 1552 goto error;
+1 -1
net/rds/tcp_connect.c
··· 145 145 addrlen = sizeof(sin); 146 146 } 147 147 148 - ret = sock->ops->bind(sock, addr, addrlen); 148 + ret = kernel_bind(sock, addr, addrlen); 149 149 if (ret) { 150 150 rdsdebug("bind failed with %d at address %pI6c\n", 151 151 ret, &conn->c_laddr);
+1 -1
net/rds/tcp_listen.c
··· 306 306 addr_len = sizeof(*sin); 307 307 } 308 308 309 - ret = sock->ops->bind(sock, (struct sockaddr *)&ss, addr_len); 309 + ret = kernel_bind(sock, (struct sockaddr *)&ss, addr_len); 310 310 if (ret < 0) { 311 311 rdsdebug("could not bind %s listener socket: %d\n", 312 312 isv6 ? "IPv6" : "IPv4", ret);
+6 -1
net/socket.c
··· 3516 3516 3517 3517 int kernel_bind(struct socket *sock, struct sockaddr *addr, int addrlen) 3518 3518 { 3519 - return READ_ONCE(sock->ops)->bind(sock, addr, addrlen); 3519 + struct sockaddr_storage address; 3520 + 3521 + memcpy(&address, addr, addrlen); 3522 + 3523 + return READ_ONCE(sock->ops)->bind(sock, (struct sockaddr *)&address, 3524 + addrlen); 3520 3525 } 3521 3526 EXPORT_SYMBOL(kernel_bind); 3522 3527