mirror of
https://github.com/torvalds/linux.git
synced 2026-05-31 18:43:33 +02:00
Merge branch 'net-introduce-struct-sockaddr_unsized'
Kees Cook says: ==================== net: Introduce struct sockaddr_unsized The historically fixed-size struct sockaddr is part of UAPI and embedded in many existing structures. The kernel uses struct sockaddr extensively within the kernel to represent arbitrarily sized sockaddr structures, which caused problems with the compiler's ability to determine object sizes correctly. The "temporary" solution was to make sockaddr explicitly use a flexible array, but this causes problems for embedding struct sockaddr in structures, where once again the compiler has to guess about the size of such objects, and causes thousands of warnings under the coming -Wflex-array-member-not-at-end warning. Switching to sockaddr_storage internally everywhere wastes a lot of memory, so we are left with needing two changes: - introduction of an explicitly arbitrarily sized sockaddr struct - switch struct sockaddr back to being fixed size Doing the latter step requires all "arbitrarily sized" uses of struct sockaddr to be replaced with the new struct from the first step. So, introduce the new struct and do enough conversions that we can switch sockaddr back to a fixed-size sa_data. ==================== Link: https://patch.msgid.link/20251104002608.do.383-kees@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
commit
89aec171d9
|
|
@ -145,7 +145,7 @@ void af_alg_release_parent(struct sock *sk)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(af_alg_release_parent);
|
||||
|
||||
static int alg_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
|
||||
static int alg_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int addr_len)
|
||||
{
|
||||
const u32 allowed = CRYPTO_ALG_KERN_DRIVER_ONLY;
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
|
|||
|
|
@ -450,7 +450,7 @@ static struct socket *drbd_try_connect(struct drbd_connection *connection)
|
|||
* a free one dynamically.
|
||||
*/
|
||||
what = "bind before connect";
|
||||
err = sock->ops->bind(sock, (struct sockaddr *) &src_in6, my_addr_len);
|
||||
err = sock->ops->bind(sock, (struct sockaddr_unsized *) &src_in6, my_addr_len);
|
||||
if (err < 0)
|
||||
goto out;
|
||||
|
||||
|
|
@ -458,7 +458,7 @@ static struct socket *drbd_try_connect(struct drbd_connection *connection)
|
|||
* stay C_WF_CONNECTION, don't go Disconnecting! */
|
||||
disconnect_on_error = 0;
|
||||
what = "connect";
|
||||
err = sock->ops->connect(sock, (struct sockaddr *) &peer_in6, peer_addr_len, 0);
|
||||
err = sock->ops->connect(sock, (struct sockaddr_unsized *) &peer_in6, peer_addr_len, 0);
|
||||
|
||||
out:
|
||||
if (err < 0) {
|
||||
|
|
@ -537,7 +537,7 @@ static int prepare_listen_socket(struct drbd_connection *connection, struct acce
|
|||
drbd_setbufsize(s_listen, sndbuf_size, rcvbuf_size);
|
||||
|
||||
what = "bind before listen";
|
||||
err = s_listen->ops->bind(s_listen, (struct sockaddr *)&my_addr, my_addr_len);
|
||||
err = s_listen->ops->bind(s_listen, (struct sockaddr_unsized *)&my_addr, my_addr_len);
|
||||
if (err < 0)
|
||||
goto out;
|
||||
|
||||
|
|
|
|||
|
|
@ -993,10 +993,10 @@ static int kernel_bindconnect(struct socket *s, struct sockaddr *laddr,
|
|||
int ret;
|
||||
|
||||
sock_set_reuseaddr(s->sk);
|
||||
ret = s->ops->bind(s, laddr, laddrlen);
|
||||
ret = s->ops->bind(s, (struct sockaddr_unsized *)laddr, laddrlen);
|
||||
if (ret)
|
||||
return ret;
|
||||
ret = s->ops->connect(s, raddr, raddrlen, flags);
|
||||
ret = s->ops->connect(s, (struct sockaddr_unsized *)raddr, raddrlen, flags);
|
||||
return ret < 0 ? ret : 0;
|
||||
}
|
||||
|
||||
|
|
@ -1315,7 +1315,7 @@ int erdma_create_listen(struct iw_cm_id *id, int backlog)
|
|||
if (ipv4_is_zeronet(laddr->sin_addr.s_addr))
|
||||
s->sk->sk_bound_dev_if = dev->netdev->ifindex;
|
||||
|
||||
ret = s->ops->bind(s, (struct sockaddr *)laddr,
|
||||
ret = s->ops->bind(s, (struct sockaddr_unsized *)laddr,
|
||||
sizeof(struct sockaddr_in));
|
||||
if (ret)
|
||||
goto error;
|
||||
|
|
|
|||
|
|
@ -1340,11 +1340,11 @@ static int kernel_bindconnect(struct socket *s, struct sockaddr *laddr,
|
|||
return rv;
|
||||
}
|
||||
|
||||
rv = s->ops->bind(s, laddr, size);
|
||||
rv = s->ops->bind(s, (struct sockaddr_unsized *)laddr, size);
|
||||
if (rv < 0)
|
||||
return rv;
|
||||
|
||||
rv = s->ops->connect(s, raddr, size, flags);
|
||||
rv = s->ops->connect(s, (struct sockaddr_unsized *)raddr, size, flags);
|
||||
|
||||
return rv < 0 ? rv : 0;
|
||||
}
|
||||
|
|
@ -1789,7 +1789,7 @@ int siw_create_listen(struct iw_cm_id *id, int backlog)
|
|||
goto error;
|
||||
}
|
||||
}
|
||||
rv = s->ops->bind(s, (struct sockaddr *)laddr,
|
||||
rv = s->ops->bind(s, (struct sockaddr_unsized *)laddr,
|
||||
sizeof(struct sockaddr_in));
|
||||
} else {
|
||||
struct sockaddr_in6 *laddr = &to_sockaddr_in6(id->local_addr);
|
||||
|
|
@ -1813,7 +1813,7 @@ int siw_create_listen(struct iw_cm_id *id, int backlog)
|
|||
goto error;
|
||||
}
|
||||
}
|
||||
rv = s->ops->bind(s, (struct sockaddr *)laddr,
|
||||
rv = s->ops->bind(s, (struct sockaddr_unsized *)laddr,
|
||||
sizeof(struct sockaddr_in6));
|
||||
}
|
||||
if (rv) {
|
||||
|
|
|
|||
|
|
@ -676,7 +676,7 @@ l1oip_socket_thread(void *data)
|
|||
hc->sin_remote.sin_port = htons((unsigned short)hc->remoteport);
|
||||
|
||||
/* bind to incoming port */
|
||||
if (socket->ops->bind(socket, (struct sockaddr *)&hc->sin_local,
|
||||
if (socket->ops->bind(socket, (struct sockaddr_unsized *)&hc->sin_local,
|
||||
sizeof(hc->sin_local))) {
|
||||
printk(KERN_ERR "%s: Failed to bind socket to port %d.\n",
|
||||
__func__, hc->localport);
|
||||
|
|
|
|||
|
|
@ -462,7 +462,7 @@ static int data_sock_getsockopt(struct socket *sock, int level, int optname,
|
|||
}
|
||||
|
||||
static int
|
||||
data_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_len)
|
||||
data_sock_bind(struct socket *sock, struct sockaddr_unsized *addr, int addr_len)
|
||||
{
|
||||
struct sockaddr_mISDN *maddr = (struct sockaddr_mISDN *) addr;
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
@ -696,7 +696,7 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
|
|||
}
|
||||
|
||||
static int
|
||||
base_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_len)
|
||||
base_sock_bind(struct socket *sock, struct sockaddr_unsized *addr, int addr_len)
|
||||
{
|
||||
struct sockaddr_mISDN *maddr = (struct sockaddr_mISDN *) addr;
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
|
|||
|
|
@ -608,8 +608,8 @@ static int pppoe_release(struct socket *sock)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int pppoe_connect(struct socket *sock, struct sockaddr *uservaddr,
|
||||
int sockaddr_len, int flags)
|
||||
static int pppoe_connect(struct socket *sock, struct sockaddr_unsized *uservaddr,
|
||||
int sockaddr_len, int flags)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
struct sockaddr_pppox *sp = (struct sockaddr_pppox *)uservaddr;
|
||||
|
|
|
|||
|
|
@ -382,8 +382,8 @@ static int pptp_rcv(struct sk_buff *skb)
|
|||
return NET_RX_DROP;
|
||||
}
|
||||
|
||||
static int pptp_bind(struct socket *sock, struct sockaddr *uservaddr,
|
||||
int sockaddr_len)
|
||||
static int pptp_bind(struct socket *sock, struct sockaddr_unsized *uservaddr,
|
||||
int sockaddr_len)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
struct sockaddr_pppox *sp = (struct sockaddr_pppox *) uservaddr;
|
||||
|
|
@ -415,8 +415,8 @@ static int pptp_bind(struct socket *sock, struct sockaddr *uservaddr,
|
|||
return error;
|
||||
}
|
||||
|
||||
static int pptp_connect(struct socket *sock, struct sockaddr *uservaddr,
|
||||
int sockaddr_len, int flags)
|
||||
static int pptp_connect(struct socket *sock, struct sockaddr_unsized *uservaddr,
|
||||
int sockaddr_len, int flags)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
struct sockaddr_pppox *sp = (struct sockaddr_pppox *) uservaddr;
|
||||
|
|
|
|||
|
|
@ -986,7 +986,7 @@ static int ath10k_qmi_new_server(struct qmi_handle *qmi_hdl,
|
|||
|
||||
ath10k_dbg(ar, ATH10K_DBG_QMI, "wifi fw qmi service found\n");
|
||||
|
||||
ret = kernel_connect(qmi_hdl->sock, (struct sockaddr *)&qmi->sq,
|
||||
ret = kernel_connect(qmi_hdl->sock, (struct sockaddr_unsized *)&qmi->sq,
|
||||
sizeof(qmi->sq), 0);
|
||||
if (ret) {
|
||||
ath10k_err(ar, "failed to connect to a remote QMI service port\n");
|
||||
|
|
|
|||
|
|
@ -3177,7 +3177,7 @@ static int ath11k_qmi_ops_new_server(struct qmi_handle *qmi_hdl,
|
|||
sq->sq_node = service->node;
|
||||
sq->sq_port = service->port;
|
||||
|
||||
ret = kernel_connect(qmi_hdl->sock, (struct sockaddr *)sq,
|
||||
ret = kernel_connect(qmi_hdl->sock, (struct sockaddr_unsized *)sq,
|
||||
sizeof(*sq), 0);
|
||||
if (ret) {
|
||||
ath11k_warn(ab, "failed to connect to qmi remote service: %d\n", ret);
|
||||
|
|
|
|||
|
|
@ -3740,7 +3740,7 @@ static int ath12k_qmi_ops_new_server(struct qmi_handle *qmi_hdl,
|
|||
sq->sq_node = service->node;
|
||||
sq->sq_port = service->port;
|
||||
|
||||
ret = kernel_connect(qmi_hdl->sock, (struct sockaddr *)sq,
|
||||
ret = kernel_connect(qmi_hdl->sock, (struct sockaddr_unsized *)sq,
|
||||
sizeof(*sq), 0);
|
||||
if (ret) {
|
||||
ath12k_warn(ab, "qmi failed to connect to remote service %d\n", ret);
|
||||
|
|
|
|||
|
|
@ -1834,7 +1834,7 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, int qid,
|
|||
sk_set_memalloc(queue->sock->sk);
|
||||
|
||||
if (nctrl->opts->mask & NVMF_OPT_HOST_TRADDR) {
|
||||
ret = kernel_bind(queue->sock, (struct sockaddr *)&ctrl->src_addr,
|
||||
ret = kernel_bind(queue->sock, (struct sockaddr_unsized *)&ctrl->src_addr,
|
||||
sizeof(ctrl->src_addr));
|
||||
if (ret) {
|
||||
dev_err(nctrl->device,
|
||||
|
|
@ -1872,7 +1872,7 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, int qid,
|
|||
dev_dbg(nctrl->device, "connecting queue %d\n",
|
||||
nvme_tcp_queue_id(queue));
|
||||
|
||||
ret = kernel_connect(queue->sock, (struct sockaddr *)&ctrl->addr,
|
||||
ret = kernel_connect(queue->sock, (struct sockaddr_unsized *)&ctrl->addr,
|
||||
sizeof(ctrl->addr), 0);
|
||||
if (ret) {
|
||||
dev_err(nctrl->device,
|
||||
|
|
|
|||
|
|
@ -2055,7 +2055,7 @@ static int nvmet_tcp_add_port(struct nvmet_port *nport)
|
|||
if (so_priority > 0)
|
||||
sock_set_priority(port->sock->sk, so_priority);
|
||||
|
||||
ret = kernel_bind(port->sock, (struct sockaddr *)&port->addr,
|
||||
ret = kernel_bind(port->sock, (struct sockaddr_unsized *)&port->addr,
|
||||
sizeof(port->addr));
|
||||
if (ret) {
|
||||
pr_err("failed to bind port socket %d\n", ret);
|
||||
|
|
|
|||
|
|
@ -463,7 +463,7 @@ static int qcom_slim_qmi_init(struct qcom_slim_ngd_ctrl *ctrl,
|
|||
}
|
||||
|
||||
rc = kernel_connect(handle->sock,
|
||||
(struct sockaddr *)&ctrl->qmi.svc_info,
|
||||
(struct sockaddr_unsized *)&ctrl->qmi.svc_info,
|
||||
sizeof(ctrl->qmi.svc_info), 0);
|
||||
if (rc < 0) {
|
||||
dev_err(ctrl->dev, "Remote Service connect failed: %d\n", rc);
|
||||
|
|
|
|||
|
|
@ -822,7 +822,7 @@ int iscsit_setup_np(
|
|||
sock_set_reuseaddr(sock->sk);
|
||||
ip_sock_set_freebind(sock->sk);
|
||||
|
||||
ret = kernel_bind(sock, (struct sockaddr *)&np->np_sockaddr, len);
|
||||
ret = kernel_bind(sock, (struct sockaddr_unsized *)&np->np_sockaddr, len);
|
||||
if (ret < 0) {
|
||||
pr_err("kernel_bind() failed: %d\n", ret);
|
||||
goto fail;
|
||||
|
|
|
|||
|
|
@ -409,7 +409,7 @@ static int pvcalls_back_connect(struct xenbus_device *dev,
|
|||
ret = sock_create(AF_INET, SOCK_STREAM, 0, &sock);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
ret = inet_stream_connect(sock, sa, req->u.connect.len, 0);
|
||||
ret = inet_stream_connect(sock, (struct sockaddr_unsized *)sa, req->u.connect.len, 0);
|
||||
if (ret < 0) {
|
||||
sock_release(sock);
|
||||
goto out;
|
||||
|
|
@ -650,7 +650,7 @@ static int pvcalls_back_bind(struct xenbus_device *dev,
|
|||
if (ret < 0)
|
||||
goto out;
|
||||
|
||||
ret = inet_bind(map->sock, (struct sockaddr *)&req->u.bind.addr,
|
||||
ret = inet_bind(map->sock, (struct sockaddr_unsized *)&req->u.bind.addr,
|
||||
req->u.bind.len);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
|
|
|
|||
|
|
@ -82,16 +82,16 @@ int afs_open_socket(struct afs_net *net)
|
|||
if (ret < 0)
|
||||
pr_err("Couldn't create RxGK CM key: %d\n", ret);
|
||||
|
||||
ret = kernel_bind(socket, (struct sockaddr *) &srx, sizeof(srx));
|
||||
ret = kernel_bind(socket, (struct sockaddr_unsized *) &srx, sizeof(srx));
|
||||
if (ret == -EADDRINUSE) {
|
||||
srx.transport.sin6.sin6_port = 0;
|
||||
ret = kernel_bind(socket, (struct sockaddr *) &srx, sizeof(srx));
|
||||
ret = kernel_bind(socket, (struct sockaddr_unsized *) &srx, sizeof(srx));
|
||||
}
|
||||
if (ret < 0)
|
||||
goto error_2;
|
||||
|
||||
srx.srx_service = YFS_CM_SERVICE;
|
||||
ret = kernel_bind(socket, (struct sockaddr *) &srx, sizeof(srx));
|
||||
ret = kernel_bind(socket, (struct sockaddr_unsized *) &srx, sizeof(srx));
|
||||
if (ret < 0)
|
||||
goto error_2;
|
||||
|
||||
|
|
|
|||
|
|
@ -708,7 +708,7 @@ static bool coredump_sock_connect(struct core_name *cn, struct coredump_params *
|
|||
*/
|
||||
pidfs_coredump(cprm);
|
||||
|
||||
retval = kernel_connect(socket, (struct sockaddr *)(&addr), addr_len,
|
||||
retval = kernel_connect(socket, (struct sockaddr_unsized *)(&addr), addr_len,
|
||||
O_NONBLOCK | SOCK_COREDUMP);
|
||||
|
||||
if (retval) {
|
||||
|
|
|
|||
|
|
@ -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++) {
|
||||
|
|
@ -1599,7 +1599,7 @@ static int dlm_connect(struct connection *con)
|
|||
|
||||
log_print_ratelimited("connecting to %d", con->nodeid);
|
||||
make_sockaddr(&addr, dlm_config.ci_tcp_port, &addr_len);
|
||||
result = kernel_connect(sock, (struct sockaddr *)&addr, addr_len, 0);
|
||||
result = kernel_connect(sock, (struct sockaddr_unsized *)&addr, addr_len, 0);
|
||||
switch (result) {
|
||||
case -EINPROGRESS:
|
||||
/* not an error */
|
||||
|
|
@ -1813,7 +1813,7 @@ 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 = kernel_bind(sock, (struct sockaddr *)&src_addr,
|
||||
result = kernel_bind(sock, (struct sockaddr_unsized *)&src_addr,
|
||||
addr_len);
|
||||
if (result < 0) {
|
||||
/* This *may* not indicate a critical error */
|
||||
|
|
@ -1852,7 +1852,7 @@ 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 kernel_bind(sock, (struct sockaddr *)&dlm_local_addr[0],
|
||||
return kernel_bind(sock, (struct sockaddr_unsized *)&dlm_local_addr[0],
|
||||
addr_len);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1615,7 +1615,7 @@ static void o2net_start_connect(struct work_struct *work)
|
|||
myaddr.sin_addr.s_addr = mynode->nd_ipv4_address;
|
||||
myaddr.sin_port = htons(0); /* any port */
|
||||
|
||||
ret = sock->ops->bind(sock, (struct sockaddr *)&myaddr,
|
||||
ret = sock->ops->bind(sock, (struct sockaddr_unsized *)&myaddr,
|
||||
sizeof(myaddr));
|
||||
if (ret) {
|
||||
mlog(ML_ERROR, "bind failed with %d at address %pI4\n",
|
||||
|
|
@ -1638,7 +1638,7 @@ static void o2net_start_connect(struct work_struct *work)
|
|||
remoteaddr.sin_port = node->nd_ipv4_port;
|
||||
|
||||
ret = sc->sc_sock->ops->connect(sc->sc_sock,
|
||||
(struct sockaddr *)&remoteaddr,
|
||||
(struct sockaddr_unsized *)&remoteaddr,
|
||||
sizeof(remoteaddr),
|
||||
O_NONBLOCK);
|
||||
if (ret == -EINPROGRESS)
|
||||
|
|
@ -2002,7 +2002,7 @@ static int o2net_open_listening_sock(__be32 addr, __be16 port)
|
|||
INIT_WORK(&o2net_listen_work, o2net_accept_many);
|
||||
|
||||
sock->sk->sk_reuse = SK_CAN_REUSE;
|
||||
ret = sock->ops->bind(sock, (struct sockaddr *)&sin, sizeof(sin));
|
||||
ret = sock->ops->bind(sock, (struct sockaddr_unsized *)&sin, sizeof(sin));
|
||||
if (ret < 0) {
|
||||
printk(KERN_ERR "o2net: Error %d while binding socket at "
|
||||
"%pI4:%u\n", ret, &addr, ntohs(port));
|
||||
|
|
|
|||
|
|
@ -3112,7 +3112,7 @@ bind_socket(struct TCP_Server_Info *server)
|
|||
struct socket *socket = server->ssocket;
|
||||
|
||||
rc = kernel_bind(socket,
|
||||
(struct sockaddr *) &server->srcaddr,
|
||||
(struct sockaddr_unsized *) &server->srcaddr,
|
||||
sizeof(server->srcaddr));
|
||||
if (rc < 0) {
|
||||
struct sockaddr_in *saddr4;
|
||||
|
|
@ -3411,7 +3411,7 @@ generic_ip_connect(struct TCP_Server_Info *server)
|
|||
socket->sk->sk_sndbuf,
|
||||
socket->sk->sk_rcvbuf, socket->sk->sk_rcvtimeo);
|
||||
|
||||
rc = kernel_connect(socket, saddr, slen,
|
||||
rc = kernel_connect(socket, (struct sockaddr_unsized *)saddr, slen,
|
||||
server->noblockcnt ? O_NONBLOCK : 0);
|
||||
/*
|
||||
* When mounting SMB root file systems, we do not want to block in
|
||||
|
|
|
|||
|
|
@ -519,10 +519,10 @@ static int create_socket(struct interface *iface)
|
|||
}
|
||||
|
||||
if (ipv4)
|
||||
ret = kernel_bind(ksmbd_socket, (struct sockaddr *)&sin,
|
||||
ret = kernel_bind(ksmbd_socket, (struct sockaddr_unsized *)&sin,
|
||||
sizeof(sin));
|
||||
else
|
||||
ret = kernel_bind(ksmbd_socket, (struct sockaddr *)&sin6,
|
||||
ret = kernel_bind(ksmbd_socket, (struct sockaddr_unsized *)&sin6,
|
||||
sizeof(sin6));
|
||||
if (ret) {
|
||||
pr_err("Failed to bind socket: %d\n", ret);
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ int __cgroup_bpf_run_filter_sk(struct sock *sk,
|
|||
enum cgroup_bpf_attach_type atype);
|
||||
|
||||
int __cgroup_bpf_run_filter_sock_addr(struct sock *sk,
|
||||
struct sockaddr *uaddr,
|
||||
struct sockaddr_unsized *uaddr,
|
||||
int *uaddrlen,
|
||||
enum cgroup_bpf_attach_type atype,
|
||||
void *t_ctx,
|
||||
|
|
@ -238,8 +238,9 @@ static inline bool cgroup_bpf_sock_enabled(struct sock *sk,
|
|||
({ \
|
||||
int __ret = 0; \
|
||||
if (cgroup_bpf_enabled(atype)) \
|
||||
__ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, uaddrlen, \
|
||||
atype, NULL, NULL); \
|
||||
__ret = __cgroup_bpf_run_filter_sock_addr(sk, \
|
||||
(struct sockaddr_unsized *)uaddr, uaddrlen, \
|
||||
atype, NULL, NULL); \
|
||||
__ret; \
|
||||
})
|
||||
|
||||
|
|
@ -248,8 +249,9 @@ static inline bool cgroup_bpf_sock_enabled(struct sock *sk,
|
|||
int __ret = 0; \
|
||||
if (cgroup_bpf_enabled(atype)) { \
|
||||
lock_sock(sk); \
|
||||
__ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, uaddrlen, \
|
||||
atype, t_ctx, NULL); \
|
||||
__ret = __cgroup_bpf_run_filter_sock_addr(sk, \
|
||||
(struct sockaddr_unsized *)uaddr, uaddrlen, \
|
||||
atype, t_ctx, NULL); \
|
||||
release_sock(sk); \
|
||||
} \
|
||||
__ret; \
|
||||
|
|
@ -266,8 +268,9 @@ static inline bool cgroup_bpf_sock_enabled(struct sock *sk,
|
|||
int __ret = 0; \
|
||||
if (cgroup_bpf_enabled(atype)) { \
|
||||
lock_sock(sk); \
|
||||
__ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, uaddrlen, \
|
||||
atype, NULL, &__flags); \
|
||||
__ret = __cgroup_bpf_run_filter_sock_addr(sk, \
|
||||
(struct sockaddr_unsized *)uaddr, uaddrlen, \
|
||||
atype, NULL, &__flags); \
|
||||
release_sock(sk); \
|
||||
if (__flags & BPF_RET_BIND_NO_CAP_NET_BIND_SERVICE) \
|
||||
*bind_flags |= BIND_NO_CAP_NET_BIND_SERVICE; \
|
||||
|
|
|
|||
|
|
@ -1515,7 +1515,7 @@ static inline int bpf_tell_extensions(void)
|
|||
|
||||
struct bpf_sock_addr_kern {
|
||||
struct sock *sk;
|
||||
struct sockaddr *uaddr;
|
||||
struct sockaddr_unsized *uaddr;
|
||||
/* Temporary "register" to make indirect stores to nested structures
|
||||
* defined above. We need three registers to make such a store, but
|
||||
* only two (src and dst) are available at convert_ctx_access time
|
||||
|
|
|
|||
|
|
@ -148,7 +148,6 @@ typedef struct {
|
|||
|
||||
struct vm_area_struct;
|
||||
struct page;
|
||||
struct sockaddr;
|
||||
struct msghdr;
|
||||
struct module;
|
||||
struct sk_buff;
|
||||
|
|
@ -163,10 +162,10 @@ struct proto_ops {
|
|||
struct module *owner;
|
||||
int (*release) (struct socket *sock);
|
||||
int (*bind) (struct socket *sock,
|
||||
struct sockaddr *myaddr,
|
||||
struct sockaddr_unsized *myaddr,
|
||||
int sockaddr_len);
|
||||
int (*connect) (struct socket *sock,
|
||||
struct sockaddr *vaddr,
|
||||
struct sockaddr_unsized *vaddr,
|
||||
int sockaddr_len, int flags);
|
||||
int (*socketpair)(struct socket *sock1,
|
||||
struct socket *sock2);
|
||||
|
|
@ -345,10 +344,10 @@ int kernel_sendmsg(struct socket *sock, struct msghdr *msg, struct kvec *vec,
|
|||
int kernel_recvmsg(struct socket *sock, struct msghdr *msg, struct kvec *vec,
|
||||
size_t num, size_t len, int flags);
|
||||
|
||||
int kernel_bind(struct socket *sock, struct sockaddr *addr, int addrlen);
|
||||
int kernel_bind(struct socket *sock, struct sockaddr_unsized *addr, int addrlen);
|
||||
int kernel_listen(struct socket *sock, int backlog);
|
||||
int kernel_accept(struct socket *sock, struct socket **newsock, int flags);
|
||||
int kernel_connect(struct socket *sock, struct sockaddr *addr, int addrlen,
|
||||
int kernel_connect(struct socket *sock, struct sockaddr_unsized *addr, int addrlen,
|
||||
int flags);
|
||||
int kernel_getsockname(struct socket *sock, struct sockaddr *addr);
|
||||
int kernel_getpeername(struct socket *sock, struct sockaddr *addr);
|
||||
|
|
|
|||
|
|
@ -32,12 +32,27 @@ typedef __kernel_sa_family_t sa_family_t;
|
|||
* 1003.1g requires sa_family_t and that sa_data is char.
|
||||
*/
|
||||
|
||||
/* Deprecated for in-kernel use. Use struct sockaddr_unsized instead. */
|
||||
struct sockaddr {
|
||||
sa_family_t sa_family; /* address family, AF_xxx */
|
||||
union {
|
||||
char sa_data_min[14]; /* Minimum 14 bytes of protocol address */
|
||||
DECLARE_FLEX_ARRAY(char, sa_data);
|
||||
};
|
||||
char sa_data[14]; /* 14 bytes of protocol address */
|
||||
};
|
||||
|
||||
/**
|
||||
* struct sockaddr_unsized - Unspecified size sockaddr for callbacks
|
||||
* @sa_family: Address family (AF_UNIX, AF_INET, AF_INET6, etc.)
|
||||
* @sa_data: Flexible array for address data
|
||||
*
|
||||
* This structure is designed for callback interfaces where the
|
||||
* total size is known via the sockaddr_len parameter. Unlike struct
|
||||
* sockaddr which has a fixed 14-byte sa_data limit or struct
|
||||
* sockaddr_storage which has a fixed 128-byte sa_data limit, this
|
||||
* structure can accommodate addresses of any size, but must be used
|
||||
* carefully.
|
||||
*/
|
||||
struct sockaddr_unsized {
|
||||
__kernel_sa_family_t sa_family; /* address family, AF_xxx */
|
||||
char sa_data[]; /* flexible address data */
|
||||
};
|
||||
|
||||
struct linger {
|
||||
|
|
|
|||
|
|
@ -19,15 +19,14 @@ struct msghdr;
|
|||
struct net;
|
||||
struct page;
|
||||
struct sock;
|
||||
struct sockaddr;
|
||||
struct socket;
|
||||
|
||||
int inet_release(struct socket *sock);
|
||||
int inet_stream_connect(struct socket *sock, struct sockaddr *uaddr,
|
||||
int inet_stream_connect(struct socket *sock, struct sockaddr_unsized *uaddr,
|
||||
int addr_len, int flags);
|
||||
int __inet_stream_connect(struct socket *sock, struct sockaddr *uaddr,
|
||||
int __inet_stream_connect(struct socket *sock, struct sockaddr_unsized *uaddr,
|
||||
int addr_len, int flags, int is_sendmsg);
|
||||
int inet_dgram_connect(struct socket *sock, struct sockaddr *uaddr,
|
||||
int inet_dgram_connect(struct socket *sock, struct sockaddr_unsized *uaddr,
|
||||
int addr_len, int flags);
|
||||
int inet_accept(struct socket *sock, struct socket *newsock,
|
||||
struct proto_accept_arg *arg);
|
||||
|
|
@ -42,8 +41,8 @@ int inet_shutdown(struct socket *sock, int how);
|
|||
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 *uaddr, int addr_len);
|
||||
int inet_bind_sk(struct sock *sk, struct sockaddr *uaddr, int addr_len);
|
||||
int inet_bind(struct socket *sock, struct sockaddr_unsized *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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
@ -1208,8 +1208,8 @@ void ipv6_local_rxpmtu(struct sock *sk, struct flowi6 *fl6, u32 mtu);
|
|||
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 *uaddr, int addr_len);
|
||||
int inet6_bind_sk(struct sock *sk, struct sockaddr *uaddr, int addr_len);
|
||||
int inet6_bind(struct socket *sock, struct sockaddr_unsized *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);
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ void ping_unhash(struct sock *sk);
|
|||
|
||||
int ping_init_sock(struct sock *sk);
|
||||
void ping_close(struct sock *sk, long timeout);
|
||||
int ping_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len);
|
||||
int ping_bind(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len);
|
||||
void ping_err(struct sk_buff *skb, int offset, u32 info);
|
||||
int ping_getfrag(void *from, char *to, int offset, int fraglen, int odd,
|
||||
struct sk_buff *);
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ void sctp_udp_sock_stop(struct net *net);
|
|||
/*
|
||||
* sctp/socket.c
|
||||
*/
|
||||
int sctp_inet_connect(struct socket *sock, struct sockaddr *uaddr,
|
||||
int sctp_inet_connect(struct socket *sock, struct sockaddr_unsized *uaddr,
|
||||
int addr_len, int flags);
|
||||
int sctp_backlog_rcv(struct sock *sk, struct sk_buff *skb);
|
||||
int sctp_inet_listen(struct socket *sock, int backlog);
|
||||
|
|
|
|||
|
|
@ -1274,10 +1274,10 @@ struct proto {
|
|||
void (*close)(struct sock *sk,
|
||||
long timeout);
|
||||
int (*pre_connect)(struct sock *sk,
|
||||
struct sockaddr *uaddr,
|
||||
struct sockaddr_unsized *uaddr,
|
||||
int addr_len);
|
||||
int (*connect)(struct sock *sk,
|
||||
struct sockaddr *uaddr,
|
||||
struct sockaddr_unsized *uaddr,
|
||||
int addr_len);
|
||||
int (*disconnect)(struct sock *sk, int flags);
|
||||
|
||||
|
|
@ -1306,9 +1306,9 @@ struct proto {
|
|||
size_t len, int flags, int *addr_len);
|
||||
void (*splice_eof)(struct socket *sock);
|
||||
int (*bind)(struct sock *sk,
|
||||
struct sockaddr *addr, int addr_len);
|
||||
struct sockaddr_unsized *addr, int addr_len);
|
||||
int (*bind_add)(struct sock *sk,
|
||||
struct sockaddr *addr, int addr_len);
|
||||
struct sockaddr_unsized *addr, int addr_len);
|
||||
|
||||
int (*backlog_rcv) (struct sock *sk,
|
||||
struct sk_buff *skb);
|
||||
|
|
@ -1920,8 +1920,8 @@ int sock_cmsg_send(struct sock *sk, struct msghdr *msg,
|
|||
* Functions to fill in entries in struct proto_ops when a protocol
|
||||
* does not implement a particular function.
|
||||
*/
|
||||
int sock_no_bind(struct socket *, struct sockaddr *, int);
|
||||
int sock_no_connect(struct socket *, struct sockaddr *, int, int);
|
||||
int sock_no_bind(struct socket *sock, struct sockaddr_unsized *saddr, int len);
|
||||
int sock_no_connect(struct socket *sock, struct sockaddr_unsized *saddr, int len, int flags);
|
||||
int sock_no_socketpair(struct socket *, struct socket *);
|
||||
int sock_no_accept(struct socket *, struct socket *, struct proto_accept_arg *);
|
||||
int sock_no_getname(struct socket *, struct sockaddr *, int);
|
||||
|
|
@ -3105,7 +3105,7 @@ void sock_set_reuseaddr(struct sock *sk);
|
|||
void sock_set_reuseport(struct sock *sk);
|
||||
void sock_set_sndtimeo(struct sock *sk, s64 secs);
|
||||
|
||||
int sock_bind_add(struct sock *sk, struct sockaddr *addr, int addr_len);
|
||||
int sock_bind_add(struct sock *sk, struct sockaddr_unsized *addr, int addr_len);
|
||||
|
||||
int sock_get_timeout(long timeo, void *optval, bool old_timeval);
|
||||
int sock_copy_user_timeval(struct __kernel_sock_timeval *tv,
|
||||
|
|
|
|||
|
|
@ -535,7 +535,7 @@ struct sock *tcp_v4_syn_recv_sock(const struct sock *sk, struct sk_buff *skb,
|
|||
struct request_sock *req_unhash,
|
||||
bool *own_req);
|
||||
int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb);
|
||||
int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len);
|
||||
int tcp_v4_connect(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len);
|
||||
int tcp_connect(struct sock *sk);
|
||||
enum tcp_synack_type {
|
||||
TCP_SYNACK_NORMAL,
|
||||
|
|
|
|||
|
|
@ -424,7 +424,7 @@ void udp4_hwcsum(struct sk_buff *skb, __be32 src, __be32 dst);
|
|||
int udp_rcv(struct sk_buff *skb);
|
||||
int udp_ioctl(struct sock *sk, int cmd, int *karg);
|
||||
int udp_init_sock(struct sock *sk);
|
||||
int udp_pre_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len);
|
||||
int udp_pre_connect(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len);
|
||||
int __udp_disconnect(struct sock *sk, int flags);
|
||||
int udp_disconnect(struct sock *sk, int flags);
|
||||
__poll_t udp_poll(struct file *file, struct socket *sock, poll_table *wait);
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ bool vsock_addr_bound(const struct sockaddr_vm *addr);
|
|||
void vsock_addr_unbind(struct sockaddr_vm *addr);
|
||||
bool vsock_addr_equals_addr(const struct sockaddr_vm *addr,
|
||||
const struct sockaddr_vm *other);
|
||||
int vsock_addr_cast(const struct sockaddr *addr, size_t len,
|
||||
int vsock_addr_cast(const struct sockaddr_unsized *addr, size_t len,
|
||||
struct sockaddr_vm **out_addr);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1665,7 +1665,7 @@ EXPORT_SYMBOL(__cgroup_bpf_run_filter_sk);
|
|||
* returned value != 1 during execution. In all other cases, 0 is returned.
|
||||
*/
|
||||
int __cgroup_bpf_run_filter_sock_addr(struct sock *sk,
|
||||
struct sockaddr *uaddr,
|
||||
struct sockaddr_unsized *uaddr,
|
||||
int *uaddrlen,
|
||||
enum cgroup_bpf_attach_type atype,
|
||||
void *t_ctx,
|
||||
|
|
@ -1676,7 +1676,7 @@ int __cgroup_bpf_run_filter_sock_addr(struct sock *sk,
|
|||
.uaddr = uaddr,
|
||||
.t_ctx = t_ctx,
|
||||
};
|
||||
struct sockaddr_storage unspec;
|
||||
struct sockaddr_storage storage;
|
||||
struct cgroup *cgrp;
|
||||
int ret;
|
||||
|
||||
|
|
@ -1688,8 +1688,8 @@ int __cgroup_bpf_run_filter_sock_addr(struct sock *sk,
|
|||
return 0;
|
||||
|
||||
if (!ctx.uaddr) {
|
||||
memset(&unspec, 0, sizeof(unspec));
|
||||
ctx.uaddr = (struct sockaddr *)&unspec;
|
||||
memset(&storage, 0, sizeof(storage));
|
||||
ctx.uaddr = (struct sockaddr_unsized *)&storage;
|
||||
ctx.uaddrlen = 0;
|
||||
} else {
|
||||
ctx.uaddrlen = *uaddrlen;
|
||||
|
|
|
|||
|
|
@ -966,7 +966,7 @@ static int p9_bind_privport(struct socket *sock)
|
|||
((struct sockaddr_in *)&stor)->sin_port = htons((ushort)port);
|
||||
else
|
||||
((struct sockaddr_in6 *)&stor)->sin6_port = htons((ushort)port);
|
||||
err = kernel_bind(sock, (struct sockaddr *)&stor, sizeof(stor));
|
||||
err = kernel_bind(sock, (struct sockaddr_unsized *)&stor, sizeof(stor));
|
||||
if (err != -EADDRINUSE)
|
||||
break;
|
||||
}
|
||||
|
|
@ -1018,7 +1018,7 @@ p9_fd_create_tcp(struct p9_client *client, const char *addr, char *args)
|
|||
}
|
||||
|
||||
err = READ_ONCE(csocket->ops)->connect(csocket,
|
||||
(struct sockaddr *)&stor,
|
||||
(struct sockaddr_unsized *)&stor,
|
||||
sizeof(stor), 0);
|
||||
if (err < 0) {
|
||||
pr_err("%s (%d): problem connecting socket to %s\n",
|
||||
|
|
@ -1058,8 +1058,8 @@ p9_fd_create_unix(struct p9_client *client, const char *addr, char *args)
|
|||
|
||||
return err;
|
||||
}
|
||||
err = READ_ONCE(csocket->ops)->connect(csocket, (struct sockaddr *)&sun_server,
|
||||
sizeof(struct sockaddr_un) - 1, 0);
|
||||
err = READ_ONCE(csocket->ops)->connect(csocket, (struct sockaddr_unsized *)&sun_server,
|
||||
sizeof(struct sockaddr_un) - 1, 0);
|
||||
if (err < 0) {
|
||||
pr_err("%s (%d): problem connecting socket: %s: %d\n",
|
||||
__func__, task_pid_nr(current), addr, err);
|
||||
|
|
|
|||
|
|
@ -1149,7 +1149,7 @@ static int atalk_autobind(struct sock *sk)
|
|||
}
|
||||
|
||||
/* Set the address 'our end' of the connection */
|
||||
static int atalk_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
|
||||
static int atalk_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int addr_len)
|
||||
{
|
||||
struct sockaddr_at *addr = (struct sockaddr_at *)uaddr;
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
@ -1204,7 +1204,7 @@ static int atalk_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
|
|||
}
|
||||
|
||||
/* Set the address we talk to */
|
||||
static int atalk_connect(struct socket *sock, struct sockaddr *uaddr,
|
||||
static int atalk_connect(struct socket *sock, struct sockaddr_unsized *uaddr,
|
||||
int addr_len, int flags)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ static int pvc_shutdown(struct socket *sock, int how)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int pvc_bind(struct socket *sock, struct sockaddr *sockaddr,
|
||||
static int pvc_bind(struct socket *sock, struct sockaddr_unsized *sockaddr,
|
||||
int sockaddr_len)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
@ -56,7 +56,7 @@ static int pvc_bind(struct socket *sock, struct sockaddr *sockaddr,
|
|||
return error;
|
||||
}
|
||||
|
||||
static int pvc_connect(struct socket *sock, struct sockaddr *sockaddr,
|
||||
static int pvc_connect(struct socket *sock, struct sockaddr_unsized *sockaddr,
|
||||
int sockaddr_len, int flags)
|
||||
{
|
||||
return pvc_bind(sock, sockaddr, sockaddr_len);
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ static int svc_release(struct socket *sock)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int svc_bind(struct socket *sock, struct sockaddr *sockaddr,
|
||||
static int svc_bind(struct socket *sock, struct sockaddr_unsized *sockaddr,
|
||||
int sockaddr_len)
|
||||
{
|
||||
DEFINE_WAIT(wait);
|
||||
|
|
@ -153,7 +153,7 @@ static int svc_bind(struct socket *sock, struct sockaddr *sockaddr,
|
|||
return error;
|
||||
}
|
||||
|
||||
static int svc_connect(struct socket *sock, struct sockaddr *sockaddr,
|
||||
static int svc_connect(struct socket *sock, struct sockaddr_unsized *sockaddr,
|
||||
int sockaddr_len, int flags)
|
||||
{
|
||||
DEFINE_WAIT(wait);
|
||||
|
|
|
|||
|
|
@ -1094,7 +1094,7 @@ static int ax25_release(struct socket *sock)
|
|||
* that we've implemented support for SO_BINDTODEVICE. It is however small
|
||||
* and trivially backward compatible.
|
||||
*/
|
||||
static int ax25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
|
||||
static int ax25_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int addr_len)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
struct full_sockaddr_ax25 *addr = (struct full_sockaddr_ax25 *)uaddr;
|
||||
|
|
@ -1175,7 +1175,7 @@ static int ax25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
|
|||
* FIXME: nonblock behaviour looks like it may have a bug.
|
||||
*/
|
||||
static int __must_check ax25_connect(struct socket *sock,
|
||||
struct sockaddr *uaddr, int addr_len, int flags)
|
||||
struct sockaddr_unsized *uaddr, int addr_len, int flags)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
ax25_cb *ax25 = sk_to_ax25(sk), *ax25t;
|
||||
|
|
|
|||
|
|
@ -1185,7 +1185,7 @@ static int hci_sock_compat_ioctl(struct socket *sock, unsigned int cmd,
|
|||
}
|
||||
#endif
|
||||
|
||||
static int hci_sock_bind(struct socket *sock, struct sockaddr *addr,
|
||||
static int hci_sock_bind(struct socket *sock, struct sockaddr_unsized *addr,
|
||||
int addr_len)
|
||||
{
|
||||
struct sockaddr_hci haddr;
|
||||
|
|
|
|||
|
|
@ -944,7 +944,7 @@ static int iso_sock_create(struct net *net, struct socket *sock, int protocol,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int iso_sock_bind_bc(struct socket *sock, struct sockaddr *addr,
|
||||
static int iso_sock_bind_bc(struct socket *sock, struct sockaddr_unsized *addr,
|
||||
int addr_len)
|
||||
{
|
||||
struct sockaddr_iso *sa = (struct sockaddr_iso *)addr;
|
||||
|
|
@ -1022,7 +1022,7 @@ static int iso_sock_bind_pa_sk(struct sock *sk, struct sockaddr_iso *sa,
|
|||
return err;
|
||||
}
|
||||
|
||||
static int iso_sock_bind(struct socket *sock, struct sockaddr *addr,
|
||||
static int iso_sock_bind(struct socket *sock, struct sockaddr_unsized *addr,
|
||||
int addr_len)
|
||||
{
|
||||
struct sockaddr_iso *sa = (struct sockaddr_iso *)addr;
|
||||
|
|
@ -1080,7 +1080,7 @@ static int iso_sock_bind(struct socket *sock, struct sockaddr *addr,
|
|||
return err;
|
||||
}
|
||||
|
||||
static int iso_sock_connect(struct socket *sock, struct sockaddr *addr,
|
||||
static int iso_sock_connect(struct socket *sock, struct sockaddr_unsized *addr,
|
||||
int alen, int flags)
|
||||
{
|
||||
struct sockaddr_iso *sa = (struct sockaddr_iso *)addr;
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ static int l2cap_validate_le_psm(u16 psm)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
|
||||
static int l2cap_sock_bind(struct socket *sock, struct sockaddr_unsized *addr, int alen)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
struct l2cap_chan *chan = l2cap_pi(sk)->chan;
|
||||
|
|
@ -178,7 +178,7 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
|
|||
return err;
|
||||
}
|
||||
|
||||
static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr,
|
||||
static int l2cap_sock_connect(struct socket *sock, struct sockaddr_unsized *addr,
|
||||
int alen, int flags)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
|
|||
|
|
@ -781,7 +781,7 @@ static struct rfcomm_session *rfcomm_session_create(bdaddr_t *src,
|
|||
addr.l2_psm = 0;
|
||||
addr.l2_cid = 0;
|
||||
addr.l2_bdaddr_type = BDADDR_BREDR;
|
||||
*err = kernel_bind(sock, (struct sockaddr *) &addr, sizeof(addr));
|
||||
*err = kernel_bind(sock, (struct sockaddr_unsized *)&addr, sizeof(addr));
|
||||
if (*err < 0)
|
||||
goto failed;
|
||||
|
||||
|
|
@ -808,7 +808,7 @@ static struct rfcomm_session *rfcomm_session_create(bdaddr_t *src,
|
|||
addr.l2_psm = cpu_to_le16(L2CAP_PSM_RFCOMM);
|
||||
addr.l2_cid = 0;
|
||||
addr.l2_bdaddr_type = BDADDR_BREDR;
|
||||
*err = kernel_connect(sock, (struct sockaddr *) &addr, sizeof(addr), O_NONBLOCK);
|
||||
*err = kernel_connect(sock, (struct sockaddr_unsized *)&addr, sizeof(addr), O_NONBLOCK);
|
||||
if (*err == 0 || *err == -EINPROGRESS)
|
||||
return s;
|
||||
|
||||
|
|
@ -2068,7 +2068,7 @@ static int rfcomm_add_listener(bdaddr_t *ba)
|
|||
addr.l2_psm = cpu_to_le16(L2CAP_PSM_RFCOMM);
|
||||
addr.l2_cid = 0;
|
||||
addr.l2_bdaddr_type = BDADDR_BREDR;
|
||||
err = kernel_bind(sock, (struct sockaddr *) &addr, sizeof(addr));
|
||||
err = kernel_bind(sock, (struct sockaddr_unsized *)&addr, sizeof(addr));
|
||||
if (err < 0) {
|
||||
BT_ERR("Bind failed %d", err);
|
||||
goto failed;
|
||||
|
|
|
|||
|
|
@ -324,7 +324,7 @@ static int rfcomm_sock_create(struct net *net, struct socket *sock,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int rfcomm_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_len)
|
||||
static int rfcomm_sock_bind(struct socket *sock, struct sockaddr_unsized *addr, int addr_len)
|
||||
{
|
||||
struct sockaddr_rc sa;
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
@ -371,7 +371,8 @@ static int rfcomm_sock_bind(struct socket *sock, struct sockaddr *addr, int addr
|
|||
return err;
|
||||
}
|
||||
|
||||
static int rfcomm_sock_connect(struct socket *sock, struct sockaddr *addr, int alen, int flags)
|
||||
static int rfcomm_sock_connect(struct socket *sock, struct sockaddr_unsized *addr,
|
||||
int alen, int flags)
|
||||
{
|
||||
struct sockaddr_rc *sa = (struct sockaddr_rc *) addr;
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
|
|||
|
|
@ -605,7 +605,7 @@ static int sco_sock_create(struct net *net, struct socket *sock, int protocol,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int sco_sock_bind(struct socket *sock, struct sockaddr *addr,
|
||||
static int sco_sock_bind(struct socket *sock, struct sockaddr_unsized *addr,
|
||||
int addr_len)
|
||||
{
|
||||
struct sockaddr_sco *sa = (struct sockaddr_sco *) addr;
|
||||
|
|
@ -639,7 +639,7 @@ static int sco_sock_bind(struct socket *sock, struct sockaddr *addr,
|
|||
return err;
|
||||
}
|
||||
|
||||
static int sco_sock_connect(struct socket *sock, struct sockaddr *addr, int alen, int flags)
|
||||
static int sco_sock_connect(struct socket *sock, struct sockaddr_unsized *addr, int alen, int flags)
|
||||
{
|
||||
struct sockaddr_sco *sa = (struct sockaddr_sco *) addr;
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
|
|||
|
|
@ -734,7 +734,7 @@ static int setsockopt(struct socket *sock, int lvl, int opt, sockptr_t ov,
|
|||
* o sock->state: holds the SS_* socket state and is updated by connect and
|
||||
* disconnect.
|
||||
*/
|
||||
static int caif_connect(struct socket *sock, struct sockaddr *uaddr,
|
||||
static int caif_connect(struct socket *sock, struct sockaddr_unsized *uaddr,
|
||||
int addr_len, int flags)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
|
|||
|
|
@ -1657,7 +1657,7 @@ static int bcm_release(struct socket *sock)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int bcm_connect(struct socket *sock, struct sockaddr *uaddr, int len,
|
||||
static int bcm_connect(struct socket *sock, struct sockaddr_unsized *uaddr, int len,
|
||||
int flags)
|
||||
{
|
||||
struct sockaddr_can *addr = (struct sockaddr_can *)uaddr;
|
||||
|
|
|
|||
|
|
@ -1246,7 +1246,7 @@ static int isotp_release(struct socket *sock)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int isotp_bind(struct socket *sock, struct sockaddr *uaddr, int len)
|
||||
static int isotp_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int len)
|
||||
{
|
||||
struct sockaddr_can *addr = (struct sockaddr_can *)uaddr;
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
|
|||
|
|
@ -440,7 +440,7 @@ static int j1939_sk_sanity_check(struct sockaddr_can *addr, int len)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int j1939_sk_bind(struct socket *sock, struct sockaddr *uaddr, int len)
|
||||
static int j1939_sk_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int len)
|
||||
{
|
||||
struct sockaddr_can *addr = (struct sockaddr_can *)uaddr;
|
||||
struct j1939_sock *jsk = j1939_sk(sock->sk);
|
||||
|
|
@ -535,7 +535,7 @@ static int j1939_sk_bind(struct socket *sock, struct sockaddr *uaddr, int len)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int j1939_sk_connect(struct socket *sock, struct sockaddr *uaddr,
|
||||
static int j1939_sk_connect(struct socket *sock, struct sockaddr_unsized *uaddr,
|
||||
int len, int flags)
|
||||
{
|
||||
struct sockaddr_can *addr = (struct sockaddr_can *)uaddr;
|
||||
|
|
|
|||
|
|
@ -449,7 +449,7 @@ static int raw_release(struct socket *sock)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int raw_bind(struct socket *sock, struct sockaddr *uaddr, int len)
|
||||
static int raw_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int len)
|
||||
{
|
||||
struct sockaddr_can *addr = (struct sockaddr_can *)uaddr;
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
|
|||
|
|
@ -460,7 +460,7 @@ int ceph_tcp_connect(struct ceph_connection *con)
|
|||
set_sock_callbacks(sock, con);
|
||||
|
||||
con_sock_state_connecting(con);
|
||||
ret = kernel_connect(sock, (struct sockaddr *)&ss, sizeof(ss),
|
||||
ret = kernel_connect(sock, (struct sockaddr_unsized *)&ss, sizeof(ss),
|
||||
O_NONBLOCK);
|
||||
if (ret == -EINPROGRESS) {
|
||||
dout("connect %s EINPROGRESS sk_state = %u\n",
|
||||
|
|
|
|||
|
|
@ -9973,7 +9973,7 @@ DECLARE_RWSEM(dev_addr_sem);
|
|||
/* "sa" is a true struct sockaddr with limited "sa_data" member. */
|
||||
int netif_get_mac_address(struct sockaddr *sa, struct net *net, char *dev_name)
|
||||
{
|
||||
size_t size = sizeof(sa->sa_data_min);
|
||||
size_t size = sizeof(sa->sa_data);
|
||||
struct net_device *dev;
|
||||
int ret = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -596,7 +596,7 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, void __user *data,
|
|||
if (ifr->ifr_hwaddr.sa_family != dev->type)
|
||||
return -EINVAL;
|
||||
memcpy(dev->broadcast, ifr->ifr_hwaddr.sa_data,
|
||||
min(sizeof(ifr->ifr_hwaddr.sa_data_min),
|
||||
min(sizeof(ifr->ifr_hwaddr.sa_data),
|
||||
(size_t)dev->addr_len));
|
||||
netdev_lock_ops(dev);
|
||||
call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);
|
||||
|
|
|
|||
|
|
@ -5978,7 +5978,7 @@ BPF_CALL_3(bpf_bind, struct bpf_sock_addr_kern *, ctx, struct sockaddr *, addr,
|
|||
return err;
|
||||
if (((struct sockaddr_in *)addr)->sin_port == htons(0))
|
||||
flags |= BIND_FORCE_ADDRESS_NO_PORT;
|
||||
return __inet_bind(sk, addr, addr_len, flags);
|
||||
return __inet_bind(sk, (struct sockaddr_unsized *)addr, addr_len, flags);
|
||||
#if IS_ENABLED(CONFIG_IPV6)
|
||||
} else if (addr->sa_family == AF_INET6) {
|
||||
if (addr_len < SIN6_LEN_RFC2133)
|
||||
|
|
@ -5988,7 +5988,8 @@ BPF_CALL_3(bpf_bind, struct bpf_sock_addr_kern *, ctx, struct sockaddr *, addr,
|
|||
/* ipv6_bpf_stub cannot be NULL, since it's called from
|
||||
* bpf_cgroup_inet6_connect hook and ipv6 is already loaded
|
||||
*/
|
||||
return ipv6_bpf_stub->inet6_bind(sk, addr, addr_len, flags);
|
||||
return ipv6_bpf_stub->inet6_bind(sk, (struct sockaddr_unsized *)addr,
|
||||
addr_len, flags);
|
||||
#endif /* CONFIG_IPV6 */
|
||||
}
|
||||
#endif /* CONFIG_INET */
|
||||
|
|
|
|||
|
|
@ -3462,13 +3462,13 @@ EXPORT_SYMBOL_GPL(sk_set_peek_off);
|
|||
* function, some default processing is provided.
|
||||
*/
|
||||
|
||||
int sock_no_bind(struct socket *sock, struct sockaddr *saddr, int len)
|
||||
int sock_no_bind(struct socket *sock, struct sockaddr_unsized *saddr, int len)
|
||||
{
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
EXPORT_SYMBOL(sock_no_bind);
|
||||
|
||||
int sock_no_connect(struct socket *sock, struct sockaddr *saddr,
|
||||
int sock_no_connect(struct socket *sock, struct sockaddr_unsized *saddr,
|
||||
int len, int flags)
|
||||
{
|
||||
return -EOPNOTSUPP;
|
||||
|
|
@ -4395,7 +4395,7 @@ bool sk_busy_loop_end(void *p, unsigned long start_time)
|
|||
EXPORT_SYMBOL(sk_busy_loop_end);
|
||||
#endif /* CONFIG_NET_RX_BUSY_POLL */
|
||||
|
||||
int sock_bind_add(struct sock *sk, struct sockaddr *addr, int addr_len)
|
||||
int sock_bind_add(struct sock *sk, struct sockaddr_unsized *addr, int addr_len)
|
||||
{
|
||||
if (!sk->sk_prot->bind_add)
|
||||
return -EOPNOTSUPP;
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ static int ieee802154_sock_sendmsg(struct socket *sock, struct msghdr *msg,
|
|||
return sk->sk_prot->sendmsg(sk, msg, len);
|
||||
}
|
||||
|
||||
static int ieee802154_sock_bind(struct socket *sock, struct sockaddr *uaddr,
|
||||
static int ieee802154_sock_bind(struct socket *sock, struct sockaddr_unsized *uaddr,
|
||||
int addr_len)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
@ -107,7 +107,7 @@ static int ieee802154_sock_bind(struct socket *sock, struct sockaddr *uaddr,
|
|||
return sock_no_bind(sock, uaddr, addr_len);
|
||||
}
|
||||
|
||||
static int ieee802154_sock_connect(struct socket *sock, struct sockaddr *uaddr,
|
||||
static int ieee802154_sock_connect(struct socket *sock, struct sockaddr_unsized *uaddr,
|
||||
int addr_len, int flags)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
@ -193,7 +193,7 @@ static void raw_close(struct sock *sk, long timeout)
|
|||
sk_common_release(sk);
|
||||
}
|
||||
|
||||
static int raw_bind(struct sock *sk, struct sockaddr *_uaddr, int len)
|
||||
static int raw_bind(struct sock *sk, struct sockaddr_unsized *_uaddr, int len)
|
||||
{
|
||||
struct ieee802154_addr addr;
|
||||
struct sockaddr_ieee802154 *uaddr = (struct sockaddr_ieee802154 *)_uaddr;
|
||||
|
|
@ -227,7 +227,7 @@ static int raw_bind(struct sock *sk, struct sockaddr *_uaddr, int len)
|
|||
return err;
|
||||
}
|
||||
|
||||
static int raw_connect(struct sock *sk, struct sockaddr *uaddr,
|
||||
static int raw_connect(struct sock *sk, struct sockaddr_unsized *uaddr,
|
||||
int addr_len)
|
||||
{
|
||||
return -ENOTSUPP;
|
||||
|
|
@ -485,7 +485,7 @@ static void dgram_close(struct sock *sk, long timeout)
|
|||
sk_common_release(sk);
|
||||
}
|
||||
|
||||
static int dgram_bind(struct sock *sk, struct sockaddr *uaddr, int len)
|
||||
static int dgram_bind(struct sock *sk, struct sockaddr_unsized *uaddr, int len)
|
||||
{
|
||||
struct sockaddr_ieee802154 *addr = (struct sockaddr_ieee802154 *)uaddr;
|
||||
struct ieee802154_addr haddr;
|
||||
|
|
@ -563,7 +563,7 @@ static int dgram_ioctl(struct sock *sk, int cmd, int *karg)
|
|||
}
|
||||
|
||||
/* FIXME: autobind */
|
||||
static int dgram_connect(struct sock *sk, struct sockaddr *uaddr,
|
||||
static int dgram_connect(struct sock *sk, struct sockaddr_unsized *uaddr,
|
||||
int len)
|
||||
{
|
||||
struct sockaddr_ieee802154 *addr = (struct sockaddr_ieee802154 *)uaddr;
|
||||
|
|
|
|||
|
|
@ -441,7 +441,7 @@ int inet_release(struct socket *sock)
|
|||
}
|
||||
EXPORT_SYMBOL(inet_release);
|
||||
|
||||
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)
|
||||
{
|
||||
u32 flags = BIND_WITH_LOCK;
|
||||
int err;
|
||||
|
|
@ -464,13 +464,13 @@ int inet_bind_sk(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
|||
return __inet_bind(sk, uaddr, addr_len, flags);
|
||||
}
|
||||
|
||||
int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
|
||||
int inet_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int addr_len)
|
||||
{
|
||||
return inet_bind_sk(sock->sk, uaddr, addr_len);
|
||||
}
|
||||
EXPORT_SYMBOL(inet_bind);
|
||||
|
||||
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)
|
||||
{
|
||||
struct sockaddr_in *addr = (struct sockaddr_in *)uaddr;
|
||||
|
|
@ -567,7 +567,7 @@ int __inet_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,
|
|||
return err;
|
||||
}
|
||||
|
||||
int inet_dgram_connect(struct socket *sock, struct sockaddr *uaddr,
|
||||
int inet_dgram_connect(struct socket *sock, struct sockaddr_unsized *uaddr,
|
||||
int addr_len, int flags)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
@ -623,7 +623,7 @@ static long inet_wait_for_connect(struct sock *sk, long timeo, int writebias)
|
|||
* Connect to a remote host. There is regrettably still a little
|
||||
* TCP 'magic' in here.
|
||||
*/
|
||||
int __inet_stream_connect(struct socket *sock, struct sockaddr *uaddr,
|
||||
int __inet_stream_connect(struct socket *sock, struct sockaddr_unsized *uaddr,
|
||||
int addr_len, int flags, int is_sendmsg)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
@ -741,7 +741,7 @@ int __inet_stream_connect(struct socket *sock, struct sockaddr *uaddr,
|
|||
}
|
||||
EXPORT_SYMBOL(__inet_stream_connect);
|
||||
|
||||
int inet_stream_connect(struct socket *sock, struct sockaddr *uaddr,
|
||||
int inet_stream_connect(struct socket *sock, struct sockaddr_unsized *uaddr,
|
||||
int addr_len, int flags)
|
||||
{
|
||||
int err;
|
||||
|
|
@ -834,7 +834,7 @@ int inet_getname(struct socket *sock, struct sockaddr *uaddr,
|
|||
}
|
||||
sin->sin_port = inet->inet_dport;
|
||||
sin->sin_addr.s_addr = inet->inet_daddr;
|
||||
BPF_CGROUP_RUN_SA_PROG(sk, (struct sockaddr *)sin, &sin_addr_len,
|
||||
BPF_CGROUP_RUN_SA_PROG(sk, sin, &sin_addr_len,
|
||||
CGROUP_INET4_GETPEERNAME);
|
||||
} else {
|
||||
__be32 addr = inet->inet_rcv_saddr;
|
||||
|
|
@ -842,7 +842,7 @@ int inet_getname(struct socket *sock, struct sockaddr *uaddr,
|
|||
addr = inet->inet_saddr;
|
||||
sin->sin_port = inet->inet_sport;
|
||||
sin->sin_addr.s_addr = addr;
|
||||
BPF_CGROUP_RUN_SA_PROG(sk, (struct sockaddr *)sin, &sin_addr_len,
|
||||
BPF_CGROUP_RUN_SA_PROG(sk, sin, &sin_addr_len,
|
||||
CGROUP_INET4_GETSOCKNAME);
|
||||
}
|
||||
release_sock(sk);
|
||||
|
|
|
|||
|
|
@ -1189,7 +1189,7 @@ static int arp_req_get(struct net *net, struct arpreq *r)
|
|||
|
||||
read_lock_bh(&neigh->lock);
|
||||
memcpy(r->arp_ha.sa_data, neigh->ha,
|
||||
min(dev->addr_len, sizeof(r->arp_ha.sa_data_min)));
|
||||
min(dev->addr_len, sizeof(r->arp_ha.sa_data)));
|
||||
r->arp_flags = arp_state_to_flags(neigh);
|
||||
read_unlock_bh(&neigh->lock);
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include <net/tcp_states.h>
|
||||
#include <net/sock_reuseport.h>
|
||||
|
||||
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)
|
||||
{
|
||||
struct inet_sock *inet = inet_sk(sk);
|
||||
struct sockaddr_in *usin = (struct sockaddr_in *) uaddr;
|
||||
|
|
@ -84,7 +84,7 @@ int __ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len
|
|||
}
|
||||
EXPORT_SYMBOL(__ip4_datagram_connect);
|
||||
|
||||
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 res;
|
||||
|
||||
|
|
|
|||
|
|
@ -286,7 +286,7 @@ void ping_close(struct sock *sk, long timeout)
|
|||
}
|
||||
EXPORT_IPV6_MOD_GPL(ping_close);
|
||||
|
||||
static int ping_pre_connect(struct sock *sk, struct sockaddr *uaddr,
|
||||
static int ping_pre_connect(struct sock *sk, struct sockaddr_unsized *uaddr,
|
||||
int addr_len)
|
||||
{
|
||||
/* This check is replicated from __ip4_datagram_connect() and
|
||||
|
|
@ -301,7 +301,7 @@ static int ping_pre_connect(struct sock *sk, struct sockaddr *uaddr,
|
|||
|
||||
/* Checks the bind address and possibly modifies sk->sk_bound_dev_if. */
|
||||
static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
|
||||
struct sockaddr *uaddr, int addr_len)
|
||||
struct sockaddr_unsized *uaddr, int addr_len)
|
||||
{
|
||||
struct net *net = sock_net(sk);
|
||||
if (sk->sk_family == AF_INET) {
|
||||
|
|
@ -387,7 +387,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void ping_set_saddr(struct sock *sk, struct sockaddr *saddr)
|
||||
static void ping_set_saddr(struct sock *sk, struct sockaddr_unsized *saddr)
|
||||
{
|
||||
if (saddr->sa_family == AF_INET) {
|
||||
struct inet_sock *isk = inet_sk(sk);
|
||||
|
|
@ -407,7 +407,7 @@ static void ping_set_saddr(struct sock *sk, struct sockaddr *saddr)
|
|||
* Moreover, we don't allow binding to multi- and broadcast addresses.
|
||||
*/
|
||||
|
||||
int ping_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
||||
int ping_bind(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len)
|
||||
{
|
||||
struct inet_sock *isk = inet_sk(sk);
|
||||
unsigned short snum;
|
||||
|
|
|
|||
|
|
@ -697,7 +697,8 @@ static void raw_destroy(struct sock *sk)
|
|||
}
|
||||
|
||||
/* This gets rid of all the nasties in af_inet. -DaveM */
|
||||
static int raw_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
||||
static int raw_bind(struct sock *sk, struct sockaddr_unsized *uaddr,
|
||||
int addr_len)
|
||||
{
|
||||
struct inet_sock *inet = inet_sk(sk);
|
||||
struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;
|
||||
|
|
|
|||
|
|
@ -1061,7 +1061,7 @@ int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg, int *copied,
|
|||
}
|
||||
}
|
||||
flags = (msg->msg_flags & MSG_DONTWAIT) ? O_NONBLOCK : 0;
|
||||
err = __inet_stream_connect(sk->sk_socket, uaddr,
|
||||
err = __inet_stream_connect(sk->sk_socket, (struct sockaddr_unsized *)uaddr,
|
||||
msg->msg_namelen, flags, 1);
|
||||
/* fastopen_req could already be freed in __inet_stream_connect
|
||||
* if the connection times out or gets rst
|
||||
|
|
|
|||
|
|
@ -205,7 +205,7 @@ int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp)
|
|||
}
|
||||
EXPORT_IPV6_MOD_GPL(tcp_twsk_unique);
|
||||
|
||||
static int tcp_v4_pre_connect(struct sock *sk, struct sockaddr *uaddr,
|
||||
static int tcp_v4_pre_connect(struct sock *sk, struct sockaddr_unsized *uaddr,
|
||||
int addr_len)
|
||||
{
|
||||
/* This check is replicated from tcp_v4_connect() and intended to
|
||||
|
|
@ -221,7 +221,7 @@ static int tcp_v4_pre_connect(struct sock *sk, struct sockaddr *uaddr,
|
|||
}
|
||||
|
||||
/* This will initiate an outgoing connection. */
|
||||
int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
||||
int tcp_v4_connect(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len)
|
||||
{
|
||||
struct sockaddr_in *usin = (struct sockaddr_in *)uaddr;
|
||||
struct inet_timewait_death_row *tcp_death_row;
|
||||
|
|
|
|||
|
|
@ -2159,7 +2159,8 @@ int udp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int flags,
|
|||
goto try_again;
|
||||
}
|
||||
|
||||
int udp_pre_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
||||
int udp_pre_connect(struct sock *sk, struct sockaddr_unsized *uaddr,
|
||||
int addr_len)
|
||||
{
|
||||
/* This check is replicated from __ip4_datagram_connect() and
|
||||
* intended to prevent BPF program called below from accessing bytes
|
||||
|
|
@ -2172,7 +2173,8 @@ int udp_pre_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
|||
}
|
||||
EXPORT_IPV6_MOD(udp_pre_connect);
|
||||
|
||||
static int udp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
||||
static int udp_connect(struct sock *sk, struct sockaddr_unsized *uaddr,
|
||||
int addr_len)
|
||||
{
|
||||
int res;
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ int udp_sock_create4(struct net *net, struct udp_port_cfg *cfg,
|
|||
udp_addr.sin_family = AF_INET;
|
||||
udp_addr.sin_addr = cfg->local_ip;
|
||||
udp_addr.sin_port = cfg->local_udp_port;
|
||||
err = kernel_bind(sock, (struct sockaddr *)&udp_addr,
|
||||
err = kernel_bind(sock, (struct sockaddr_unsized *)&udp_addr,
|
||||
sizeof(udp_addr));
|
||||
if (err < 0)
|
||||
goto error;
|
||||
|
|
@ -38,7 +38,7 @@ int udp_sock_create4(struct net *net, struct udp_port_cfg *cfg,
|
|||
udp_addr.sin_family = AF_INET;
|
||||
udp_addr.sin_addr = cfg->peer_ip;
|
||||
udp_addr.sin_port = cfg->peer_udp_port;
|
||||
err = kernel_connect(sock, (struct sockaddr *)&udp_addr,
|
||||
err = kernel_connect(sock, (struct sockaddr_unsized *)&udp_addr,
|
||||
sizeof(udp_addr), 0);
|
||||
if (err < 0)
|
||||
goto error;
|
||||
|
|
|
|||
|
|
@ -277,7 +277,7 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol,
|
|||
goto out;
|
||||
}
|
||||
|
||||
static int __inet6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,
|
||||
static int __inet6_bind(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len,
|
||||
u32 flags)
|
||||
{
|
||||
struct sockaddr_in6 *addr = (struct sockaddr_in6 *)uaddr;
|
||||
|
|
@ -438,7 +438,7 @@ static int __inet6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,
|
|||
goto out;
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
u32 flags = BIND_WITH_LOCK;
|
||||
const struct proto *prot;
|
||||
|
|
@ -465,7 +465,7 @@ int inet6_bind_sk(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
|||
}
|
||||
|
||||
/* bind for INET6 API */
|
||||
int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
|
||||
int inet6_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int addr_len)
|
||||
{
|
||||
return inet6_bind_sk(sock->sk, uaddr, addr_len);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ void ip6_datagram_release_cb(struct sock *sk)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(ip6_datagram_release_cb);
|
||||
|
||||
int __ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr,
|
||||
int __ip6_datagram_connect(struct sock *sk, struct sockaddr_unsized *uaddr,
|
||||
int addr_len)
|
||||
{
|
||||
struct sockaddr_in6 *usin = (struct sockaddr_in6 *) uaddr;
|
||||
|
|
@ -194,7 +194,7 @@ int __ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr,
|
|||
sin.sin_port = usin->sin6_port;
|
||||
|
||||
err = __ip4_datagram_connect(sk,
|
||||
(struct sockaddr *) &sin,
|
||||
(struct sockaddr_unsized *)&sin,
|
||||
sizeof(sin));
|
||||
|
||||
ipv4_connected:
|
||||
|
|
@ -271,7 +271,7 @@ int __ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr,
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(__ip6_datagram_connect);
|
||||
|
||||
int ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
||||
int ip6_datagram_connect(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len)
|
||||
{
|
||||
int res;
|
||||
|
||||
|
|
@ -282,7 +282,7 @@ int ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(ip6_datagram_connect);
|
||||
|
||||
int ip6_datagram_connect_v6_only(struct sock *sk, struct sockaddr *uaddr,
|
||||
int ip6_datagram_connect_v6_only(struct sock *sk, struct sockaddr_unsized *uaddr,
|
||||
int addr_len)
|
||||
{
|
||||
DECLARE_SOCKADDR(struct sockaddr_in6 *, sin6, uaddr);
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg,
|
|||
memcpy(&udp6_addr.sin6_addr, &cfg->local_ip6,
|
||||
sizeof(udp6_addr.sin6_addr));
|
||||
udp6_addr.sin6_port = cfg->local_udp_port;
|
||||
err = kernel_bind(sock, (struct sockaddr *)&udp6_addr,
|
||||
err = kernel_bind(sock, (struct sockaddr_unsized *)&udp6_addr,
|
||||
sizeof(udp6_addr));
|
||||
if (err < 0)
|
||||
goto error;
|
||||
|
|
@ -52,7 +52,7 @@ int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg,
|
|||
sizeof(udp6_addr.sin6_addr));
|
||||
udp6_addr.sin6_port = cfg->peer_udp_port;
|
||||
err = kernel_connect(sock,
|
||||
(struct sockaddr *)&udp6_addr,
|
||||
(struct sockaddr_unsized *)&udp6_addr,
|
||||
sizeof(udp6_addr), 0);
|
||||
}
|
||||
if (err < 0)
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ static int dummy_ipv6_chk_addr(struct net *net, const struct in6_addr *addr,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int ping_v6_pre_connect(struct sock *sk, struct sockaddr *uaddr,
|
||||
static int ping_v6_pre_connect(struct sock *sk, struct sockaddr_unsized *uaddr,
|
||||
int addr_len)
|
||||
{
|
||||
/* This check is replicated from __ip6_datagram_connect() and
|
||||
|
|
|
|||
|
|
@ -214,7 +214,8 @@ bool raw6_local_deliver(struct sk_buff *skb, int nexthdr)
|
|||
}
|
||||
|
||||
/* This cleans up af_inet6 a bit. -DaveM */
|
||||
static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
||||
static int rawv6_bind(struct sock *sk, struct sockaddr_unsized *uaddr,
|
||||
int addr_len)
|
||||
{
|
||||
struct inet_sock *inet = inet_sk(sk);
|
||||
struct ipv6_pinfo *np = inet6_sk(sk);
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ static u32 tcp_v6_init_ts_off(const struct net *net, const struct sk_buff *skb)
|
|||
ipv6_hdr(skb)->saddr.s6_addr32);
|
||||
}
|
||||
|
||||
static int tcp_v6_pre_connect(struct sock *sk, struct sockaddr *uaddr,
|
||||
static int tcp_v6_pre_connect(struct sock *sk, struct sockaddr_unsized *uaddr,
|
||||
int addr_len)
|
||||
{
|
||||
/* This check is replicated from tcp_v6_connect() and intended to
|
||||
|
|
@ -133,7 +133,7 @@ static int tcp_v6_pre_connect(struct sock *sk, struct sockaddr *uaddr,
|
|||
return BPF_CGROUP_RUN_PROG_INET6_CONNECT(sk, uaddr, &addr_len);
|
||||
}
|
||||
|
||||
static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
|
||||
static int tcp_v6_connect(struct sock *sk, struct sockaddr_unsized *uaddr,
|
||||
int addr_len)
|
||||
{
|
||||
struct sockaddr_in6 *usin = (struct sockaddr_in6 *) uaddr;
|
||||
|
|
@ -238,7 +238,7 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
|
|||
tp->af_specific = &tcp_sock_ipv6_mapped_specific;
|
||||
#endif
|
||||
|
||||
err = tcp_v4_connect(sk, (struct sockaddr *)&sin, sizeof(sin));
|
||||
err = tcp_v4_connect(sk, (struct sockaddr_unsized *)&sin, sizeof(sin));
|
||||
|
||||
if (err) {
|
||||
icsk->icsk_ext_hdr_len = exthdrlen;
|
||||
|
|
|
|||
|
|
@ -1282,7 +1282,7 @@ static void udp_v6_flush_pending_frames(struct sock *sk)
|
|||
}
|
||||
}
|
||||
|
||||
static int udpv6_pre_connect(struct sock *sk, struct sockaddr *uaddr,
|
||||
static int udpv6_pre_connect(struct sock *sk, struct sockaddr_unsized *uaddr,
|
||||
int addr_len)
|
||||
{
|
||||
if (addr_len < offsetofend(struct sockaddr, sa_family))
|
||||
|
|
@ -1303,7 +1303,8 @@ static int udpv6_pre_connect(struct sock *sk, struct sockaddr *uaddr,
|
|||
return BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK(sk, uaddr, &addr_len);
|
||||
}
|
||||
|
||||
static int udpv6_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
||||
static int udpv6_connect(struct sock *sk, struct sockaddr_unsized *uaddr,
|
||||
int addr_len)
|
||||
{
|
||||
int res;
|
||||
|
||||
|
|
|
|||
|
|
@ -563,7 +563,7 @@ static void __iucv_auto_name(struct iucv_sock *iucv)
|
|||
}
|
||||
|
||||
/* Bind an unbound socket */
|
||||
static int iucv_sock_bind(struct socket *sock, struct sockaddr *addr,
|
||||
static int iucv_sock_bind(struct socket *sock, struct sockaddr_unsized *addr,
|
||||
int addr_len)
|
||||
{
|
||||
DECLARE_SOCKADDR(struct sockaddr_iucv *, sa, addr);
|
||||
|
|
@ -668,7 +668,7 @@ static int iucv_sock_autobind(struct sock *sk)
|
|||
return err;
|
||||
}
|
||||
|
||||
static int afiucv_path_connect(struct socket *sock, struct sockaddr *addr)
|
||||
static int afiucv_path_connect(struct socket *sock, struct sockaddr_unsized *addr)
|
||||
{
|
||||
DECLARE_SOCKADDR(struct sockaddr_iucv *, sa, addr);
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
@ -714,7 +714,7 @@ static int afiucv_path_connect(struct socket *sock, struct sockaddr *addr)
|
|||
}
|
||||
|
||||
/* Connect an unconnected socket */
|
||||
static int iucv_sock_connect(struct socket *sock, struct sockaddr *addr,
|
||||
static int iucv_sock_connect(struct socket *sock, struct sockaddr_unsized *addr,
|
||||
int alen, int flags)
|
||||
{
|
||||
DECLARE_SOCKADDR(struct sockaddr_iucv *, sa, addr);
|
||||
|
|
|
|||
|
|
@ -1503,7 +1503,7 @@ static int l2tp_tunnel_sock_create(struct net *net,
|
|||
memcpy(&ip6_addr.l2tp_addr, cfg->local_ip6,
|
||||
sizeof(ip6_addr.l2tp_addr));
|
||||
ip6_addr.l2tp_conn_id = tunnel_id;
|
||||
err = kernel_bind(sock, (struct sockaddr *)&ip6_addr,
|
||||
err = kernel_bind(sock, (struct sockaddr_unsized *)&ip6_addr,
|
||||
sizeof(ip6_addr));
|
||||
if (err < 0)
|
||||
goto out;
|
||||
|
|
@ -1513,7 +1513,7 @@ static int l2tp_tunnel_sock_create(struct net *net,
|
|||
sizeof(ip6_addr.l2tp_addr));
|
||||
ip6_addr.l2tp_conn_id = peer_tunnel_id;
|
||||
err = kernel_connect(sock,
|
||||
(struct sockaddr *)&ip6_addr,
|
||||
(struct sockaddr_unsized *)&ip6_addr,
|
||||
sizeof(ip6_addr), 0);
|
||||
if (err < 0)
|
||||
goto out;
|
||||
|
|
@ -1530,7 +1530,7 @@ static int l2tp_tunnel_sock_create(struct net *net,
|
|||
ip_addr.l2tp_family = AF_INET;
|
||||
ip_addr.l2tp_addr = cfg->local_ip;
|
||||
ip_addr.l2tp_conn_id = tunnel_id;
|
||||
err = kernel_bind(sock, (struct sockaddr *)&ip_addr,
|
||||
err = kernel_bind(sock, (struct sockaddr_unsized *)&ip_addr,
|
||||
sizeof(ip_addr));
|
||||
if (err < 0)
|
||||
goto out;
|
||||
|
|
@ -1538,7 +1538,7 @@ static int l2tp_tunnel_sock_create(struct net *net,
|
|||
ip_addr.l2tp_family = AF_INET;
|
||||
ip_addr.l2tp_addr = cfg->peer_ip;
|
||||
ip_addr.l2tp_conn_id = peer_tunnel_id;
|
||||
err = kernel_connect(sock, (struct sockaddr *)&ip_addr,
|
||||
err = kernel_connect(sock, (struct sockaddr_unsized *)&ip_addr,
|
||||
sizeof(ip_addr), 0);
|
||||
if (err < 0)
|
||||
goto out;
|
||||
|
|
|
|||
|
|
@ -267,7 +267,8 @@ static void l2tp_ip_destroy_sock(struct sock *sk)
|
|||
}
|
||||
}
|
||||
|
||||
static int l2tp_ip_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
||||
static int l2tp_ip_bind(struct sock *sk, struct sockaddr_unsized *uaddr,
|
||||
int addr_len)
|
||||
{
|
||||
struct inet_sock *inet = inet_sk(sk);
|
||||
struct sockaddr_l2tpip *addr = (struct sockaddr_l2tpip *)uaddr;
|
||||
|
|
@ -328,7 +329,8 @@ static int l2tp_ip_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int l2tp_ip_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
||||
static int l2tp_ip_connect(struct sock *sk, struct sockaddr_unsized *uaddr,
|
||||
int addr_len)
|
||||
{
|
||||
struct sockaddr_l2tpip *lsa = (struct sockaddr_l2tpip *)uaddr;
|
||||
struct l2tp_ip_net *pn = l2tp_ip_pernet(sock_net(sk));
|
||||
|
|
|
|||
|
|
@ -280,7 +280,8 @@ static void l2tp_ip6_destroy_sock(struct sock *sk)
|
|||
}
|
||||
}
|
||||
|
||||
static int l2tp_ip6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
||||
static int l2tp_ip6_bind(struct sock *sk, struct sockaddr_unsized *uaddr,
|
||||
int addr_len)
|
||||
{
|
||||
struct inet_sock *inet = inet_sk(sk);
|
||||
struct ipv6_pinfo *np = inet6_sk(sk);
|
||||
|
|
@ -383,7 +384,7 @@ static int l2tp_ip6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
|||
return err;
|
||||
}
|
||||
|
||||
static int l2tp_ip6_connect(struct sock *sk, struct sockaddr *uaddr,
|
||||
static int l2tp_ip6_connect(struct sock *sk, struct sockaddr_unsized *uaddr,
|
||||
int addr_len)
|
||||
{
|
||||
struct sockaddr_l2tpip6 *lsa = (struct sockaddr_l2tpip6 *)uaddr;
|
||||
|
|
|
|||
|
|
@ -684,7 +684,7 @@ static struct l2tp_tunnel *pppol2tp_tunnel_get(struct net *net,
|
|||
|
||||
/* connect() handler. Attach a PPPoX socket to a tunnel UDP socket
|
||||
*/
|
||||
static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,
|
||||
static int pppol2tp_connect(struct socket *sock, struct sockaddr_unsized *uservaddr,
|
||||
int sockaddr_len, int flags)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
|
|||
|
|
@ -337,7 +337,7 @@ static int llc_ui_autobind(struct socket *sock, struct sockaddr_llc *addr)
|
|||
* otherwise all hell will break loose.
|
||||
* Returns: 0 upon success, negative otherwise.
|
||||
*/
|
||||
static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen)
|
||||
static int llc_ui_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int addrlen)
|
||||
{
|
||||
struct sockaddr_llc *addr = (struct sockaddr_llc *)uaddr;
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
@ -477,7 +477,7 @@ static int llc_ui_shutdown(struct socket *sock, int how)
|
|||
* This function will autobind if user did not previously call bind.
|
||||
* Returns: 0 upon success, negative otherwise.
|
||||
*/
|
||||
static int llc_ui_connect(struct socket *sock, struct sockaddr *uaddr,
|
||||
static int llc_ui_connect(struct socket *sock, struct sockaddr_unsized *uaddr,
|
||||
int addrlen, int flags)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ static bool mctp_sockaddr_ext_is_ok(const struct sockaddr_mctp_ext *addr)
|
|||
!addr->__smctp_pad0[2];
|
||||
}
|
||||
|
||||
static int mctp_bind(struct socket *sock, struct sockaddr *addr, int addrlen)
|
||||
static int mctp_bind(struct socket *sock, struct sockaddr_unsized *addr, int addrlen)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
struct mctp_sock *msk = container_of(sk, struct mctp_sock, sk);
|
||||
|
|
@ -128,7 +128,7 @@ static int mctp_bind(struct socket *sock, struct sockaddr *addr, int addrlen)
|
|||
/* Used to set a specific peer prior to bind. Not used for outbound
|
||||
* connections (Tag Owner set) since MCTP is a datagram protocol.
|
||||
*/
|
||||
static int mctp_connect(struct socket *sock, struct sockaddr *addr,
|
||||
static int mctp_connect(struct socket *sock, struct sockaddr_unsized *addr,
|
||||
int addrlen, int flags)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
|
|||
|
|
@ -205,7 +205,7 @@ static void __mctp_route_test_init(struct kunit *test,
|
|||
addr.smctp_network = netid;
|
||||
addr.smctp_addr.s_addr = 8;
|
||||
addr.smctp_type = 0;
|
||||
rc = kernel_bind(sock, (struct sockaddr *)&addr, sizeof(addr));
|
||||
rc = kernel_bind(sock, (struct sockaddr_unsized *)&addr, sizeof(addr));
|
||||
KUNIT_ASSERT_EQ(test, rc, 0);
|
||||
|
||||
*devp = dev;
|
||||
|
|
|
|||
|
|
@ -279,7 +279,7 @@ void mctp_test_bind_run(struct kunit *test,
|
|||
addr.smctp_addr.s_addr = setup->peer_addr;
|
||||
/* connect() type must match bind() type */
|
||||
addr.smctp_type = setup->bind_type;
|
||||
rc = kernel_connect(*sock, (struct sockaddr *)&addr,
|
||||
rc = kernel_connect(*sock, (struct sockaddr_unsized *)&addr,
|
||||
sizeof(addr), 0);
|
||||
KUNIT_EXPECT_EQ(test, rc, 0);
|
||||
}
|
||||
|
|
@ -292,5 +292,6 @@ void mctp_test_bind_run(struct kunit *test,
|
|||
addr.smctp_type = setup->bind_type;
|
||||
|
||||
*ret_bind_errno =
|
||||
kernel_bind(*sock, (struct sockaddr *)&addr, sizeof(addr));
|
||||
kernel_bind(*sock, (struct sockaddr_unsized *)&addr,
|
||||
sizeof(addr));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -867,10 +867,10 @@ static int mptcp_pm_nl_create_listen_socket(struct sock *sk,
|
|||
addrlen = sizeof(struct sockaddr_in6);
|
||||
#endif
|
||||
if (ssk->sk_family == AF_INET)
|
||||
err = inet_bind_sk(ssk, (struct sockaddr *)&addr, addrlen);
|
||||
err = inet_bind_sk(ssk, (struct sockaddr_unsized *)&addr, addrlen);
|
||||
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
|
||||
else if (ssk->sk_family == AF_INET6)
|
||||
err = inet6_bind_sk(ssk, (struct sockaddr *)&addr, addrlen);
|
||||
err = inet6_bind_sk(ssk, (struct sockaddr_unsized *)&addr, addrlen);
|
||||
#endif
|
||||
if (err)
|
||||
return err;
|
||||
|
|
|
|||
|
|
@ -3746,7 +3746,8 @@ static int mptcp_ioctl(struct sock *sk, int cmd, int *karg)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int mptcp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
||||
static int mptcp_connect(struct sock *sk, struct sockaddr_unsized *uaddr,
|
||||
int addr_len)
|
||||
{
|
||||
struct mptcp_subflow_context *subflow;
|
||||
struct mptcp_sock *msk = mptcp_sk(sk);
|
||||
|
|
@ -3856,7 +3857,7 @@ static struct proto mptcp_prot = {
|
|||
.no_autobind = true,
|
||||
};
|
||||
|
||||
static int mptcp_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
|
||||
static int mptcp_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int addr_len)
|
||||
{
|
||||
struct mptcp_sock *msk = mptcp_sk(sock->sk);
|
||||
struct sock *ssk, *sk = sock->sk;
|
||||
|
|
|
|||
|
|
@ -1660,7 +1660,7 @@ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_pm_local *local,
|
|||
addrlen = sizeof(struct sockaddr_in6);
|
||||
#endif
|
||||
ssk->sk_bound_dev_if = local->ifindex;
|
||||
err = kernel_bind(sf, (struct sockaddr *)&addr, addrlen);
|
||||
err = kernel_bind(sf, (struct sockaddr_unsized *)&addr, addrlen);
|
||||
if (err) {
|
||||
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_JOINSYNTXBINDERR);
|
||||
pr_debug("msk=%p local=%d remote=%d bind error: %d\n",
|
||||
|
|
@ -1680,7 +1680,7 @@ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_pm_local *local,
|
|||
|
||||
sock_hold(ssk);
|
||||
list_add_tail(&subflow->node, &msk->conn_list);
|
||||
err = kernel_connect(sf, (struct sockaddr *)&addr, addrlen, O_NONBLOCK);
|
||||
err = kernel_connect(sf, (struct sockaddr_unsized *)&addr, addrlen, O_NONBLOCK);
|
||||
if (err && err != -EINPROGRESS) {
|
||||
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_JOINSYNTXCONNECTERR);
|
||||
pr_debug("msk=%p local=%d remote=%d connect error: %d\n",
|
||||
|
|
|
|||
|
|
@ -1435,7 +1435,7 @@ static int bind_mcastif_addr(struct socket *sock, struct net_device *dev)
|
|||
sin.sin_addr.s_addr = addr;
|
||||
sin.sin_port = 0;
|
||||
|
||||
return kernel_bind(sock, (struct sockaddr *)&sin, sizeof(sin));
|
||||
return kernel_bind(sock, (struct sockaddr_unsized *)&sin, sizeof(sin));
|
||||
}
|
||||
|
||||
static void get_mcast_sockaddr(union ipvs_sockaddr *sa, int *salen,
|
||||
|
|
@ -1501,7 +1501,7 @@ static int make_send_sock(struct netns_ipvs *ipvs, int id,
|
|||
}
|
||||
|
||||
get_mcast_sockaddr(&mcast_addr, &salen, &ipvs->mcfg, id);
|
||||
result = kernel_connect(sock, (struct sockaddr *)&mcast_addr,
|
||||
result = kernel_connect(sock, (struct sockaddr_unsized *)&mcast_addr,
|
||||
salen, 0);
|
||||
if (result < 0) {
|
||||
pr_err("Error connecting to the multicast addr\n");
|
||||
|
|
@ -1542,7 +1542,7 @@ static int make_receive_sock(struct netns_ipvs *ipvs, int id,
|
|||
|
||||
get_mcast_sockaddr(&mcast_addr, &salen, &ipvs->bcfg, id);
|
||||
sock->sk->sk_bound_dev_if = dev->ifindex;
|
||||
result = kernel_bind(sock, (struct sockaddr *)&mcast_addr, salen);
|
||||
result = kernel_bind(sock, (struct sockaddr_unsized *)&mcast_addr, salen);
|
||||
if (result < 0) {
|
||||
pr_err("Error binding to the multicast addr\n");
|
||||
goto error;
|
||||
|
|
|
|||
|
|
@ -966,7 +966,7 @@ static void netlink_undo_bind(int group, long unsigned int groups,
|
|||
nlk->netlink_unbind(sock_net(sk), undo + 1);
|
||||
}
|
||||
|
||||
static int netlink_bind(struct socket *sock, struct sockaddr *addr,
|
||||
static int netlink_bind(struct socket *sock, struct sockaddr_unsized *addr,
|
||||
int addr_len)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
@ -1054,7 +1054,7 @@ static int netlink_bind(struct socket *sock, struct sockaddr *addr,
|
|||
return err;
|
||||
}
|
||||
|
||||
static int netlink_connect(struct socket *sock, struct sockaddr *addr,
|
||||
static int netlink_connect(struct socket *sock, struct sockaddr_unsized *addr,
|
||||
int alen, int flags)
|
||||
{
|
||||
int err = 0;
|
||||
|
|
|
|||
|
|
@ -561,7 +561,7 @@ static int nr_release(struct socket *sock)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int nr_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
|
||||
static int nr_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int addr_len)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
struct nr_sock *nr = nr_sk(sk);
|
||||
|
|
@ -632,8 +632,8 @@ static int nr_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int nr_connect(struct socket *sock, struct sockaddr *uaddr,
|
||||
int addr_len, int flags)
|
||||
static int nr_connect(struct socket *sock, struct sockaddr_unsized *uaddr,
|
||||
int addr_len, int flags)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
struct nr_sock *nr = nr_sk(sk);
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ static struct proto llcp_sock_proto = {
|
|||
.obj_size = sizeof(struct nfc_llcp_sock),
|
||||
};
|
||||
|
||||
static int llcp_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
|
||||
static int llcp_sock_bind(struct socket *sock, struct sockaddr_unsized *addr, int alen)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
struct nfc_llcp_sock *llcp_sock = nfc_llcp_sock(sk);
|
||||
|
|
@ -146,7 +146,7 @@ static int llcp_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int llcp_raw_sock_bind(struct socket *sock, struct sockaddr *addr,
|
||||
static int llcp_raw_sock_bind(struct socket *sock, struct sockaddr_unsized *addr,
|
||||
int alen)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
@ -648,7 +648,7 @@ static int llcp_sock_release(struct socket *sock)
|
|||
return err;
|
||||
}
|
||||
|
||||
static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr,
|
||||
static int llcp_sock_connect(struct socket *sock, struct sockaddr_unsized *_addr,
|
||||
int len, int flags)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ static int rawsock_release(struct socket *sock)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int rawsock_connect(struct socket *sock, struct sockaddr *_addr,
|
||||
static int rawsock_connect(struct socket *sock, struct sockaddr_unsized *_addr,
|
||||
int len, int flags)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
|
|||
|
|
@ -3279,11 +3279,12 @@ static int packet_do_bind(struct sock *sk, const char *name, int ifindex,
|
|||
* Bind a packet socket to a device
|
||||
*/
|
||||
|
||||
static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr,
|
||||
static int packet_bind_spkt(struct socket *sock, struct sockaddr_unsized *uaddr,
|
||||
int addr_len)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
char name[sizeof(uaddr->sa_data_min) + 1];
|
||||
struct sockaddr *sa = (struct sockaddr *)uaddr;
|
||||
char name[sizeof(sa->sa_data) + 1];
|
||||
|
||||
/*
|
||||
* Check legality
|
||||
|
|
@ -3294,13 +3295,13 @@ static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr,
|
|||
/* uaddr->sa_data comes from the userspace, it's not guaranteed to be
|
||||
* zero-terminated.
|
||||
*/
|
||||
memcpy(name, uaddr->sa_data, sizeof(uaddr->sa_data_min));
|
||||
name[sizeof(uaddr->sa_data_min)] = 0;
|
||||
memcpy(name, sa->sa_data, sizeof(sa->sa_data));
|
||||
name[sizeof(sa->sa_data)] = 0;
|
||||
|
||||
return packet_do_bind(sk, name, 0, 0);
|
||||
}
|
||||
|
||||
static int packet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
|
||||
static int packet_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int addr_len)
|
||||
{
|
||||
struct sockaddr_ll *sll = (struct sockaddr_ll *)uaddr;
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
@ -3580,11 +3581,11 @@ static int packet_getname_spkt(struct socket *sock, struct sockaddr *uaddr,
|
|||
return -EOPNOTSUPP;
|
||||
|
||||
uaddr->sa_family = AF_PACKET;
|
||||
memset(uaddr->sa_data, 0, sizeof(uaddr->sa_data_min));
|
||||
memset(uaddr->sa_data, 0, sizeof(uaddr->sa_data));
|
||||
rcu_read_lock();
|
||||
dev = dev_get_by_index_rcu(sock_net(sk), READ_ONCE(pkt_sk(sk)->ifindex));
|
||||
if (dev)
|
||||
strscpy(uaddr->sa_data, dev->name, sizeof(uaddr->sa_data_min));
|
||||
strscpy(uaddr->sa_data, dev->name, sizeof(uaddr->sa_data));
|
||||
rcu_read_unlock();
|
||||
|
||||
return sizeof(*uaddr);
|
||||
|
|
|
|||
|
|
@ -882,7 +882,8 @@ static struct sock *pep_sock_accept(struct sock *sk,
|
|||
return newsk;
|
||||
}
|
||||
|
||||
static int pep_sock_connect(struct sock *sk, struct sockaddr *addr, int len)
|
||||
static int pep_sock_connect(struct sock *sk, struct sockaddr_unsized *addr,
|
||||
int len)
|
||||
{
|
||||
struct pep_sock *pn = pep_sk(sk);
|
||||
int err;
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ EXPORT_SYMBOL(pn_sock_unhash);
|
|||
|
||||
static DEFINE_MUTEX(port_mutex);
|
||||
|
||||
static int pn_socket_bind(struct socket *sock, struct sockaddr *addr, int len)
|
||||
static int pn_socket_bind(struct socket *sock, struct sockaddr_unsized *addr, int len)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
struct pn_sock *pn = pn_sk(sk);
|
||||
|
|
@ -206,16 +206,16 @@ static int pn_socket_autobind(struct socket *sock)
|
|||
|
||||
memset(&sa, 0, sizeof(sa));
|
||||
sa.spn_family = AF_PHONET;
|
||||
err = pn_socket_bind(sock, (struct sockaddr *)&sa,
|
||||
sizeof(struct sockaddr_pn));
|
||||
err = pn_socket_bind(sock, (struct sockaddr_unsized *)&sa,
|
||||
sizeof(struct sockaddr_pn));
|
||||
if (err != -EINVAL)
|
||||
return err;
|
||||
BUG_ON(!pn_port(pn_sk(sock->sk)->sobject));
|
||||
return 0; /* socket was already bound */
|
||||
}
|
||||
|
||||
static int pn_socket_connect(struct socket *sock, struct sockaddr *addr,
|
||||
int len, int flags)
|
||||
static int pn_socket_connect(struct socket *sock, struct sockaddr_unsized *addr,
|
||||
int len, int flags)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
struct pn_sock *pn = pn_sk(sk);
|
||||
|
|
|
|||
|
|
@ -824,7 +824,7 @@ static int qrtr_autobind(struct socket *sock)
|
|||
}
|
||||
|
||||
/* Bind socket to specified sockaddr. */
|
||||
static int qrtr_bind(struct socket *sock, struct sockaddr *saddr, int len)
|
||||
static int qrtr_bind(struct socket *sock, struct sockaddr_unsized *saddr, int len)
|
||||
{
|
||||
DECLARE_SOCKADDR(struct sockaddr_qrtr *, addr, saddr);
|
||||
struct qrtr_sock *ipc = qrtr_sk(sock->sk);
|
||||
|
|
@ -1084,7 +1084,7 @@ static int qrtr_recvmsg(struct socket *sock, struct msghdr *msg,
|
|||
return rc;
|
||||
}
|
||||
|
||||
static int qrtr_connect(struct socket *sock, struct sockaddr *saddr,
|
||||
static int qrtr_connect(struct socket *sock, struct sockaddr_unsized *saddr,
|
||||
int len, int flags)
|
||||
{
|
||||
DECLARE_SOCKADDR(struct sockaddr_qrtr *, addr, saddr);
|
||||
|
|
|
|||
|
|
@ -714,7 +714,7 @@ int qrtr_ns_init(void)
|
|||
sq.sq_port = QRTR_PORT_CTRL;
|
||||
qrtr_ns.local_node = sq.sq_node;
|
||||
|
||||
ret = kernel_bind(qrtr_ns.sock, (struct sockaddr *)&sq, sizeof(sq));
|
||||
ret = kernel_bind(qrtr_ns.sock, (struct sockaddr_unsized *)&sq, sizeof(sq));
|
||||
if (ret < 0) {
|
||||
pr_err("failed to bind to socket\n");
|
||||
goto err_wq;
|
||||
|
|
|
|||
|
|
@ -533,7 +533,7 @@ static int rds_getsockopt(struct socket *sock, int level, int optname,
|
|||
|
||||
}
|
||||
|
||||
static int rds_connect(struct socket *sock, struct sockaddr *uaddr,
|
||||
static int rds_connect(struct socket *sock, struct sockaddr_unsized *uaddr,
|
||||
int addr_len, int flags)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@ void rds_remove_bound(struct rds_sock *rs)
|
|||
rs->rs_bound_addr = in6addr_any;
|
||||
}
|
||||
|
||||
int rds_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
|
||||
int rds_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int addr_len)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
struct rds_sock *rs = rds_sk_to_rs(sk);
|
||||
|
|
|
|||
|
|
@ -735,7 +735,7 @@ extern wait_queue_head_t rds_poll_waitq;
|
|||
|
||||
|
||||
/* bind.c */
|
||||
int rds_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len);
|
||||
int rds_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int addr_len);
|
||||
void rds_remove_bound(struct rds_sock *rs);
|
||||
struct rds_sock *rds_find_bound(const struct in6_addr *addr, __be16 port,
|
||||
__u32 scope_id);
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user