openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'sctp-fixes' 

Xin Long says:

====================
sctp: fix the issue that may copy duplicate addrs into assoc's bind address list

Patch 1/2 is to fix some indent level.

Given that we have kernels out there with this issue, patch 2/2 also
fix sctp_raw_to_bind_addrs.

v1 -> v2:
  Explain why we didn't filter the duplicate addresses when global
  address list gets updated in patch 2/2 changelog.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2016-12-20 14:15:45 -05:00
parent 92f95322c6 b8607805dd
commit b794e252f5
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/sctp/bind_addr.c
View File

@ -292,6 +292,8 @@ int sctp_raw_to_bind_addrs(struct sctp_bind_addr *bp, __u8 *raw_addr_list,
} }
af->from_addr_param(&addr, rawaddr, htons(port), 0); af->from_addr_param(&addr, rawaddr, htons(port), 0);
if (sctp_bind_addr_state(bp, &addr) != -1)
goto next;
retval = sctp_add_bind_addr(bp, &addr, sizeof(addr), retval = sctp_add_bind_addr(bp, &addr, sizeof(addr),
SCTP_ADDR_SRC, gfp); SCTP_ADDR_SRC, gfp);
if (retval) { if (retval) {
@ -300,6 +302,7 @@ int sctp_raw_to_bind_addrs(struct sctp_bind_addr *bp, __u8 *raw_addr_list,
break; break;
} }
next:
len = ntohs(param->length); len = ntohs(param->length);
addrs_len -= len; addrs_len -= len;
raw_addr_list += len; raw_addr_list += len;

40
net/sctp/protocol.c
View File

@ -205,26 +205,30 @@ int sctp_copy_local_addr_list(struct net *net, struct sctp_bind_addr *bp,
list_for_each_entry_rcu(addr, &net->sctp.local_addr_list, list) { list_for_each_entry_rcu(addr, &net->sctp.local_addr_list, list) {
if (!addr->valid) if (!addr->valid)
continue; continue;
if (sctp_in_scope(net, &addr->a, scope)) { if (!sctp_in_scope(net, &addr->a, scope))
/* Now that the address is in scope, check to see if continue;
* the address type is really supported by the local
* sock as well as the remote peer. /* Now that the address is in scope, check to see if
*/ * the address type is really supported by the local
if ((((AF_INET == addr->a.sa.sa_family) && * sock as well as the remote peer.
(copy_flags & SCTP_ADDR4_PEERSUPP))) || */
(((AF_INET6 == addr->a.sa.sa_family) && if (addr->a.sa.sa_family == AF_INET &&
(copy_flags & SCTP_ADDR6_ALLOWED) && !(copy_flags & SCTP_ADDR4_PEERSUPP))
(copy_flags & SCTP_ADDR6_PEERSUPP)))) { continue;
error = sctp_add_bind_addr(bp, &addr->a, if (addr->a.sa.sa_family == AF_INET6 &&
sizeof(addr->a), (!(copy_flags & SCTP_ADDR6_ALLOWED) ||
SCTP_ADDR_SRC, GFP_ATOMIC); !(copy_flags & SCTP_ADDR6_PEERSUPP)))
if (error) continue;
goto end_copy;
} if (sctp_bind_addr_state(bp, &addr->a) != -1)
} continue;
error = sctp_add_bind_addr(bp, &addr->a, sizeof(addr->a),
SCTP_ADDR_SRC, GFP_ATOMIC);
if (error)
break;
} }
end_copy:
rcu_read_unlock(); rcu_read_unlock();
return error; return error;
} }