niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

mptcp: address lookup improvements

Browse source 
When looking-up a socket address in the endpoint list, we
must prefer port-based matches over address only match.

Ensure that port-based endpoints are listed first, using
head insertion for them. Additionally be sure that only
port-based endpoints carry a non zero port number.

Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Paolo Abeni 2022-07-11 12:16:30 -07:00 • committed by Jakub Kicinski
parent f5360e9b31
commit bedee0b561
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
net/mptcp/pm_netlink.c
View file

@ -413,7 +413,7 @@ static bool lookup_address_in_vec(const struct mptcp_addr_info *addrs, unsigned
int i; int i;
for (i = 0; i < nr; i++) { for (i = 0; i < nr; i++) {
if (mptcp_addresses_equal(&addrs[i], addr, addr->port)) if (addrs[i].id == addr->id)
return true; return true;
} }
@ -449,7 +449,8 @@ static unsigned int fill_remote_addresses_vec(struct mptcp_sock *msk, bool fullm
mptcp_for_each_subflow(msk, subflow) { mptcp_for_each_subflow(msk, subflow) {
ssk = mptcp_subflow_tcp_sock(subflow); ssk = mptcp_subflow_tcp_sock(subflow);
remote_address((struct sock_common *)ssk, &addrs[i]); remote_address((struct sock_common *)ssk, &addrs[i]);
if (deny_id0 && mptcp_addresses_equal(&addrs[i], &remote, false)) addrs[i].id = subflow->remote_id;
if (deny_id0 && !addrs[i].id)
continue; continue;
if (!lookup_address_in_vec(addrs, i, &addrs[i]) && if (!lookup_address_in_vec(addrs, i, &addrs[i]) &&
@ -919,10 +920,11 @@ static int mptcp_pm_nl_append_new_local_addr(struct pm_nl_pernet *pernet,
/* do not insert duplicate address, differentiate on port only /* do not insert duplicate address, differentiate on port only
* singled addresses * singled addresses
*/ */
if (!address_use_port(entry))
entry->addr.port = 0;
list_for_each_entry(cur, &pernet->local_addr_list, list) { list_for_each_entry(cur, &pernet->local_addr_list, list) {
if (mptcp_addresses_equal(&cur->addr, &entry->addr, if (mptcp_addresses_equal(&cur->addr, &entry->addr,
address_use_port(entry) && cur->addr.port || entry->addr.port)) {
address_use_port(cur))) {
/* allow replacing the exiting endpoint only if such /* allow replacing the exiting endpoint only if such
* endpoint is an implicit one and the user-space * endpoint is an implicit one and the user-space
* did not provide an endpoint id * did not provide an endpoint id
@ -968,7 +970,10 @@ find_next:
} }
pernet->addrs++; pernet->addrs++;
list_add_tail_rcu(&entry->list, &pernet->local_addr_list); if (!entry->addr.port)
list_add_tail_rcu(&entry->list, &pernet->local_addr_list);
else
list_add_rcu(&entry->list, &pernet->local_addr_list);
ret = entry->addr.id; ret = entry->addr.id;
out: out: