Commit 449f68f8 authored by Kees Cook's avatar Kees Cook Committed by Jakub Kicinski
Browse files

net: Convert proto callbacks from sockaddr to sockaddr_unsized 



Convert struct proto pre_connect(), connect(), bind(), and bind_add()
callback function prototypes from struct sockaddr to struct sockaddr_unsized.
This does not change per-implementation use of sockaddr for passing around
an arbitrarily sized sockaddr struct. Those will be addressed in future
patches.

Additionally removes the no longer referenced struct sockaddr from
include/net/inet_common.h.

No binary changes expected.

Signed-off-by: default avatarKees Cook <kees@kernel.org>
Link: https://patch.msgid.link/20251104002617.2752303-5-kees@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 3d39d341

fs/dlm/lowcomms.c

+2 −2
Original line number Diff line number Diff line
@@ -1126,7 +1126,7 @@ static void writequeue_entry_complete(struct writequeue_entry *e, int completed) 
static int sctp_bind_addrs(struct socket *sock, __be16 port)

{

	struct sockaddr_storage localaddr;

	struct sockaddr *addr = (struct sockaddr *)&localaddr;

	struct sockaddr_unsized *addr = (struct sockaddr_unsized *)&localaddr;

	int i, addr_len, result = 0;



	for (i = 0; i < dlm_local_count; i++) {
@@ -1134,7 +1134,7 @@ static int sctp_bind_addrs(struct socket *sock, __be16 port) 
		make_sockaddr(&localaddr, port, &addr_len);



		if (!i)

			result = kernel_bind(sock, (struct sockaddr_unsized *)addr, addr_len);

			result = kernel_bind(sock, addr, addr_len);

		else

			result = sock_bind_add(sock->sk, addr, addr_len);

include/net/inet_common.h

+2 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ struct msghdr; 
struct net;

struct page;

struct sock;

struct sockaddr;

struct socket;



int inet_release(struct socket *sock);
@@ -43,7 +42,7 @@ int inet_listen(struct socket *sock, int backlog); 
int __inet_listen_sk(struct sock *sk, int backlog);

void inet_sock_destruct(struct sock *sk);

int inet_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int addr_len);

int inet_bind_sk(struct sock *sk, struct sockaddr *uaddr, int addr_len);

int inet_bind_sk(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len);

/* Don't allocate port at this moment, defer to connect. */

#define BIND_FORCE_ADDRESS_NO_PORT	(1 << 0)

/* Grab and release socket lock. */
@@ -52,7 +51,7 @@ int inet_bind_sk(struct sock *sk, struct sockaddr *uaddr, int addr_len); 
#define BIND_FROM_BPF			(1 << 2)

/* Skip CAP_NET_BIND_SERVICE check. */

#define BIND_NO_CAP_NET_BIND_SERVICE	(1 << 3)

int __inet_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,

int __inet_bind(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len,

		u32 flags);

int inet_getname(struct socket *sock, struct sockaddr *uaddr,

		 int peer);

include/net/ip.h

+2 −2
Original line number Diff line number Diff line
@@ -261,8 +261,8 @@ static inline u8 ip_sendmsg_scope(const struct inet_sock *inet, 
}



/* datagram.c */

int __ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len);

int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len);

int __ip4_datagram_connect(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len);

int ip4_datagram_connect(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len);



void ip4_datagram_release_cb(struct sock *sk);

include/net/ipv6.h

+4 −4
Original line number Diff line number Diff line
@@ -1188,10 +1188,10 @@ int do_ipv6_getsockopt(struct sock *sk, int level, int optname, 
int ipv6_getsockopt(struct sock *sk, int level, int optname,

		    char __user *optval, int __user *optlen);



int __ip6_datagram_connect(struct sock *sk, struct sockaddr *addr,

int __ip6_datagram_connect(struct sock *sk, struct sockaddr_unsized *addr,

			   int addr_len);

int ip6_datagram_connect(struct sock *sk, struct sockaddr *addr, int addr_len);

int ip6_datagram_connect_v6_only(struct sock *sk, struct sockaddr *addr,

int ip6_datagram_connect(struct sock *sk, struct sockaddr_unsized *addr, int addr_len);

int ip6_datagram_connect_v6_only(struct sock *sk, struct sockaddr_unsized *addr,

				 int addr_len);

int ip6_datagram_dst_update(struct sock *sk, bool fix_sk_saddr);

void ip6_datagram_release_cb(struct sock *sk);
@@ -1209,7 +1209,7 @@ void inet6_cleanup_sock(struct sock *sk); 
void inet6_sock_destruct(struct sock *sk);

int inet6_release(struct socket *sock);

int inet6_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int addr_len);

int inet6_bind_sk(struct sock *sk, struct sockaddr *uaddr, int addr_len);

int inet6_bind_sk(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len);

int inet6_getname(struct socket *sock, struct sockaddr *uaddr,

		  int peer);

int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);

include/net/ipv6_stubs.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ extern const struct ipv6_stub *ipv6_stub __read_mostly; 


/* A stub used by bpf helpers. Similarly ugly as ipv6_stub */

struct ipv6_bpf_stub {

	int (*inet6_bind)(struct sock *sk, struct sockaddr *uaddr, int addr_len,

	int (*inet6_bind)(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len,

			  u32 flags);

	struct sock *(*udp6_lib_lookup)(const struct net *net,

				     const struct in6_addr *saddr, __be16 sport,