sctp: delete addr based on sin6_scope_id
Subsystems (3)
PATCH 1/1 sctp: delete addr based on sin6_scope_id
sctp_inet6addr_event deletes 'addr' from 'local_addr_list' when setting netdev down, but it has possibility to delete the incorroct entry (match the first one with the same ipaddr, but the different 'ifindex'), if there are some netdevs with the same 'local-link' ipaddr added already. It should delete the entry depending on 'sin6_addr' and 'sin6_scope_id' both, otherwise, the endpoint will call 'sctp_sf_ootb' if it can't find the accroding association when receives 'heartbeat', and finally will reply 'abort' which causes the test case for NOKIA SYSCOM GW failed.
For example:
1.when linux startup
the entries in local_addr_list:
ifindex:35 addr:fe80::40:43ff:fe80:0 (eths0.201)
ifindex:36 addr:fe80::40:43ff:fe80:0 (eths0.209)
ifindex:37 addr:fe80::40:43ff:fe80:0 (eths0.210)
the route table:
local fe80::40:43ff:fe80:0 dev eths0.201
local fe80::40:43ff:fe80:0 dev eths0.209
local fe80::40:43ff:fe80:0 dev eths0.210
2.after 'ifconfig eths0.209 down'
the entries in local_addr_list:
ifindex:36 addr:fe80::40:43ff:fe80:0 (eths0.209)
ifindex:37 addr:fe80::40:43ff:fe80:0 (eths0.210)
the route table:
local fe80::40:43ff:fe80:0 dev eths0.201
local fe80::40:43ff:fe80:0 dev eths0.210
3.asoc not found for src:[fe80::40:43ff:fe80:0]:37381 dst:[:1]:53335 ::1->fe80::40:43ff:fe80:0 HEARTBEAT fe80::40:43ff:fe80:0->::1 ABORT
--- net/sctp/ipv6.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/sctp/ipv6.c +3 -1
@@ -100,7 +100,9 @@ static int sctp_inet6addr_event(struct notifier_block *this, unsigned long ev, &net->sctp.local_addr_list, list) {if (addr->a.sa.sa_family ==AF_INET6 &&ipv6_addr_equal (&addr->a.v6.sin6_addr, - &ifa->addr)) { + &ifa->addr) && + addr->a.v6.sin6_scope_id == + ifa->idev->dev->ifindex) {sctp_addr_wq_mgmt (net, addr,SCTP_ADDR_DEL ); found =1 ; addr->valid =0 ;
Signature · 1 line
2.19.0
Marcelo Ricardo Leitner
maintainerHi,
The fix is right, but a couple of small changes:
Quoted 2 lines · Chen Shen
sctp_inet6addr_eventdeletes 'addr' from 'local_addr_list' when setting netdev down, but it has possibility to delete the incorroct entry (match
^ typo
Quoted 5 lines
the first one with the same ipaddr, but the different 'ifindex'), if there are some netdevs with the same 'local-link' ipaddr added already. It should delete the entry depending on '
sin6_addr' and 'sin6_scope_id' both, otherwise, the endpoint will call 'sctp_sf_ootb' if it can't find the accroding association when receives 'heartbeat', and finally will
^^ typo
Quoted 2 lines
reply 'abort' which causes the test case for NOKIA SYSCOM GW failed.
...
net/sctp/ipv6.c static int sctp_inet6addr_event(struct notifier_block *this, unsigned long ev, · line 105
Quoted 12 lines
net/sctp/ipv6.c +3
-1@@ -100,7 +100,9 @@ static int sctp_inet6addr_event(struct notifier_block *this, unsigned long ev, &net->sctp.local_addr_list, list) {if (addr->a.sa.sa_family ==AF_INET6 &&ipv6_addr_equal (&addr->a.v6.sin6_addr, - &ifa->addr)) { + &ifa->addr) && + addr->a.v6.sin6_scope_id == + ifa->idev->dev->ifindex) {
The indentation here is not right. It was wrong already, but lets seize the moment and fix it. This is how it should look like:
if (addr->a.sa.sa_family == AF_INET6 &&
ipv6_addr_equal(&addr->a.v6.sin6_addr,
&ifa->addr) &&
addr->a.v6.sin6_scope_id == ifa->idev->dev->ifindex) {Thanks,
Marcelo
Quoted 6 lines
net/sctp/ipv6.c +0
-0sctp_addr_wq_mgmt (net, addr,SCTP_ADDR_DEL ); found =1 ; addr->valid =0 ;Signature · 1 line
2.19.0
PATCH v2 1/1 sctp: delete addr based on sin6_scope_id
sctp_inet6addr_event deletes 'addr' from 'local_addr_list' when setting netdev down, but it is possible to delete the incorrect entry (match the first one with the same ipaddr, but the different 'ifindex'), if there are some netdevs with the same 'local-link' ipaddr added already. It should delete the entry depending on 'sin6_addr' and 'sin6_scope_id' both. otherwise, the endpoint will call 'sctp_sf_ootb' if it can't find the according association when receives 'heartbeat', and finally will reply 'abort'.
For example:
1.when linux startup
the entries in local_addr_list:
ifindex:35 addr:fe80::40:43ff:fe80:0 (eths0.201)
ifindex:36 addr:fe80::40:43ff:fe80:0 (eths0.209)
ifindex:37 addr:fe80::40:43ff:fe80:0 (eths0.210)
the route table:
local fe80::40:43ff:fe80:0 dev eths0.201
local fe80::40:43ff:fe80:0 dev eths0.209
local fe80::40:43ff:fe80:0 dev eths0.210
2.after 'ifconfig eths0.209 down'
the entries in local_addr_list:
ifindex:36 addr:fe80::40:43ff:fe80:0 (eths0.209)
ifindex:37 addr:fe80::40:43ff:fe80:0 (eths0.210)
the route table:
local fe80::40:43ff:fe80:0 dev eths0.201
local fe80::40:43ff:fe80:0 dev eths0.210
3.asoc not found for src:[fe80::40:43ff:fe80:0]:37381 dst:[:1]:53335 ::1->fe80::40:43ff:fe80:0 HEARTBEAT fe80::40:43ff:fe80:0->::1 ABORT
--- net/sctp/ipv6.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/sctp/ipv6.c +3 -2
@@ -99,8 +99,9 @@ static int sctp_inet6addr_event(struct notifier_block *this, unsigned long ev,list_for_each_entry_safe (addr, temp, &net->sctp.local_addr_list, list) {if (addr->a.sa.sa_family ==AF_INET6 && -ipv6_addr_equal (&addr->a.v6.sin6_addr, - &ifa->addr)) { +ipv6_addr_equal (&addr->a.v6.sin6_addr, + &ifa->addr) && + addr->a.v6.sin6_scope_id == ifa->idev->dev->ifindex) {sctp_addr_wq_mgmt (net, addr,SCTP_ADDR_DEL ); found =1 ; addr->valid =0 ;
Signature · 1 line
2.19.0
This patch was applied to netdev/net.git (refs/heads/master):
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
Quoted 10 lines · On Mon, 26 Jul 2021 13:47:34 +0800 you wrote:
sctp_inet6addr_eventdeletes 'addr' from 'local_addr_list' when setting netdev down, but it is possible to delete the incorrect entry (match the first one with the same ipaddr, but the different 'ifindex'), if there are some netdevs with the same 'local-link' ipaddr added already. It should delete the entry depending on 'sin6_addr' and 'sin6_scope_id' both. otherwise, the endpoint will call 'sctp_sf_ootb' if it can't find the according association when receives 'heartbeat', and finally will reply 'abort'.[...]
Here is the summary with links:
- [v2] sctp: delete addr based on sin6_scope_id
https://git.kernel.org/netdev/net/c/2ebda0271483
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html