microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[SCTP]: Get rid of the last remnants of sin_port flipping. 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Al Viro 2006-11-20 17:25:15 -08:00 коммит произвёл David S. Miller
Родитель 6fbfa9f951
Коммит dce116ae86
1 изменённых файлов: 6 добавлений и 13 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

19
net/sctp/socket.c
Просмотреть файл

@ -1000,7 +1000,6 @@ static int __sctp_connect(struct sock* sk,
goto out_free; goto out_free;
memcpy(&to, sa_addr, af->sockaddr_len); memcpy(&to, sa_addr, af->sockaddr_len);
to.v4.sin_port = ntohs(to.v4.sin_port);
/* Check if there already is a matching association on the /* Check if there already is a matching association on the
* endpoint (other than the one created here). * endpoint (other than the one created here).
@ -1049,7 +1048,7 @@ static int __sctp_connect(struct sock* sk,
} }
} }
scope = sctp_scope(&to); scope = sctp_scope(sa_addr);
asoc = sctp_association_new(ep, sk, scope, GFP_KERNEL); asoc = sctp_association_new(ep, sk, scope, GFP_KERNEL);
if (!asoc) { if (!asoc) {
err = -ENOMEM; err = -ENOMEM;
@ -1357,7 +1356,7 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
struct sctp_association *new_asoc=NULL, *asoc=NULL; struct sctp_association *new_asoc=NULL, *asoc=NULL;
struct sctp_transport *transport, *chunk_tp; struct sctp_transport *transport, *chunk_tp;
struct sctp_chunk *chunk; struct sctp_chunk *chunk;
union sctp_addr to, tmp; union sctp_addr to;
struct sockaddr *msg_name = NULL; struct sockaddr *msg_name = NULL;
struct sctp_sndrcvinfo default_sinfo = { 0 }; struct sctp_sndrcvinfo default_sinfo = { 0 };
struct sctp_sndrcvinfo *sinfo; struct sctp_sndrcvinfo *sinfo;
@ -1411,12 +1410,6 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
if (msg_namelen > sizeof(to)) if (msg_namelen > sizeof(to))
msg_namelen = sizeof(to); msg_namelen = sizeof(to);
memcpy(&to, msg->msg_name, msg_namelen); memcpy(&to, msg->msg_name, msg_namelen);
memcpy(&tmp, msg->msg_name, msg_namelen);
SCTP_DEBUG_PRINTK("Just memcpy'd. msg_name is "
"0x%x:%u.\n",
to.v4.sin_addr.s_addr, to.v4.sin_port);
to.v4.sin_port = ntohs(to.v4.sin_port);
msg_name = msg->msg_name; msg_name = msg->msg_name;
} }
@ -1466,7 +1459,7 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
/* If a msg_name has been specified, assume this is to be used. */ /* If a msg_name has been specified, assume this is to be used. */
if (msg_name) { if (msg_name) {
/* Look for a matching association on the endpoint. */ /* Look for a matching association on the endpoint. */
asoc = sctp_endpoint_lookup_assoc(ep, &tmp, &transport); asoc = sctp_endpoint_lookup_assoc(ep, &to, &transport);
if (!asoc) { if (!asoc) {
/* If we could not find a matching association on the /* If we could not find a matching association on the
* endpoint, make sure that it is not a TCP-style * endpoint, make sure that it is not a TCP-style
@ -1475,7 +1468,7 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
*/ */
if ((sctp_style(sk, TCP) && if ((sctp_style(sk, TCP) &&
sctp_sstate(sk, ESTABLISHED)) || sctp_sstate(sk, ESTABLISHED)) ||
sctp_endpoint_is_peeled_off(ep, &tmp)) { sctp_endpoint_is_peeled_off(ep, &to)) {
err = -EADDRNOTAVAIL; err = -EADDRNOTAVAIL;
goto out_unlock; goto out_unlock;
} }
@ -1612,7 +1605,7 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
} }
/* Prime the peer's transport structures. */ /* Prime the peer's transport structures. */
transport = sctp_assoc_add_peer(asoc, &tmp, GFP_KERNEL, SCTP_UNKNOWN); transport = sctp_assoc_add_peer(asoc, &to, GFP_KERNEL, SCTP_UNKNOWN);
if (!transport) { if (!transport) {
err = -ENOMEM; err = -ENOMEM;
goto out_free; goto out_free;
@ -1679,7 +1672,7 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
*/ */
if ((sctp_style(sk, TCP) && msg_name) || if ((sctp_style(sk, TCP) && msg_name) ||
(sinfo_flags & SCTP_ADDR_OVER)) { (sinfo_flags & SCTP_ADDR_OVER)) {
chunk_tp = sctp_assoc_lookup_paddr(asoc, &tmp); chunk_tp = sctp_assoc_lookup_paddr(asoc, &to);
if (!chunk_tp) { if (!chunk_tp) {
err = -EINVAL; err = -EINVAL;
goto out_free; goto out_free;