Skip to content

Commit 8d93d59

Browse files
committed
mptcp: fix for setting remote ipv4mapped address
JIRA: https://issues.redhat.com/browse/RHEL-115576 Upstream Status: net-next.git commit 0e6f1c7 commit 0e6f1c7 Author: Geliang Tang <geliang@kernel.org> Date: Tue Jan 14 19:06:22 2025 +0100 mptcp: fix for setting remote ipv4mapped address Commit 1c670b3 ("mptcp: change local addr type of subflow_destroy") introduced a bug in mptcp_pm_nl_subflow_destroy_doit(). ipv6_addr_set_v4mapped() should be called to set the remote ipv4 address 'addr_r.addr.s_addr' to the remote ipv6 address 'addr_r.addr6', not 'addr_l.addr.addr6', which is the local ipv6 address. Fixes: 1c670b3 ("mptcp: change local addr type of subflow_destroy") Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Link: https://patch.msgid.link/20250114-net-next-mptcp-fix-remote-addr-v1-1-debcd84ea86f@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Davide Caratti <dcaratti@redhat.com>
1 parent 6bfda2a commit 8d93d59

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/mptcp/pm_userspace.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, struct genl_info *info
505505
addr_l.addr.family = AF_INET6;
506506
}
507507
if (addr_r.family == AF_INET && ipv6_addr_v4mapped(&addr_l.addr.addr6)) {
508-
ipv6_addr_set_v4mapped(addr_r.addr.s_addr, &addr_l.addr.addr6);
508+
ipv6_addr_set_v4mapped(addr_r.addr.s_addr, &addr_r.addr6);
509509
addr_r.family = AF_INET6;
510510
}
511511
#endif

0 commit comments

Comments
 (0)