net: sctp: fix copying sk_v6_rcv_saddr in sctp_v6_create_accept_sk
Subsystems (3)
PATCH 1/1 net: sctp: fix copying sk_v6_rcv_saddr in sctp_v6_create_accept_sk
Wang reported an issue that lksctp's test_getname_v6 seems to fail.
The issue is that we do not copy sk_v6_rcv_saddr over to the new socket, although the comment above says so regarding rcv_saddr.
Commit 914e1c8b6980 ("sctp: Inherit all socket options from parent correctly.") originally moved that over to sctp_copy_sock(), but after commit efe4208f47f9 ("ipv6: make lookups simpler and faster") this no longer holds and the actual value of sk_v6_rcv_saddr was no longer being migrated.
With this patch, the lksctp test suite passes again for IPv6.
--- net/sctp/ipv6.c | 1 + 1 file changed, 1 insertion(+)
net/sctp/ipv6.c +1 -0
@@ -661,6 +661,7 @@ static struct sock *sctp_v6_create_accept_sk(struct sock *sk,* and getpeername(). */ sctp_v6_to_sk_daddr (&asoc->peer.primary_addr, newsk); + newsk->sk_v6_rcv_saddr = sk->sk_v6_rcv_saddr;sk_refcnt_debug_inc (newsk);
Signature · 1 line
1.8.3.1
Quoted 26 lines · Daniel Borkmann
Wang reported an issue that lksctp's
test_getname_v6seems to fail.The issue is that we do not copy
sk_v6_rcv_saddrover to the new socket, although the comment above says so regardingrcv_saddr.Commit
914e1c8b6980("sctp: Inherit all socket options from parent correctly.") originally moved that over tosctp_copy_sock(), but after commitefe4208f47f9("ipv6: make lookups simpler and faster") this no longer holds and the actual value ofsk_v6_rcv_saddrwas no longer being migrated.With this patch, the lksctp test suite passes again for IPv6.
Fixes efe4208f47f9 ("ipv6: make lookups simpler and faster")Signed-off-by Daniel Borkmann <[email protected]>Signed-off-by Wang Weidong <[email protected]>Cc Eric Dumazet <[email protected]>--- net/sctp/ipv6.c | 1 + 1 file changed, 1 insertion(+)net/sctp/ipv6.c +0
-0
net/sctp/ipv6.c static struct sock *sctp_v6_create_accept_sk(struct sock *sk, · line 667
Quoted 7 lines
net/sctp/ipv6.c +1
-0@@ -661,6 +661,7 @@ static struct sock *sctp_v6_create_accept_sk(struct sock *sk,* and getpeername(). */ sctp_v6_to_sk_daddr (&asoc->peer.primary_addr, newsk); + newsk->sk_v6_rcv_saddr = sk->sk_v6_rcv_saddr;sk_refcnt_debug_inc (newsk);
Quoted 1 line
Quoted 27 lines · Daniel Borkmann
Wang reported an issue that lksctp's
test_getname_v6seems to fail.The issue is that we do not copy
sk_v6_rcv_saddrover to the new socket, although the comment above says so regardingrcv_saddr.Commit
914e1c8b6980("sctp: Inherit all socket options from parent correctly.") originally moved that over tosctp_copy_sock(), but after commitefe4208f47f9("ipv6: make lookups simpler and faster") this no longer holds and the actual value ofsk_v6_rcv_saddrwas no longer being migrated.With this patch, the lksctp test suite passes again for IPv6.
Fixes efe4208f47f9 ("ipv6: make lookups simpler and faster")Signed-off-by Daniel Borkmann <[email protected]>Signed-off-by Wang Weidong <[email protected]>Cc Eric Dumazet <[email protected]>--- net/sctp/ipv6.c | 1 + 1 file changed, 1 insertion(+)net/sctp/ipv6.c +0
-0
net/sctp/ipv6.c static struct sock *sctp_v6_create_accept_sk(struct sock *sk, · line 667
Quoted 7 lines
net/sctp/ipv6.c +1
-0@@ -661,6 +661,7 @@ static struct sock *sctp_v6_create_accept_sk(struct sock *sk,* and getpeername(). */ sctp_v6_to_sk_daddr (&asoc->peer.primary_addr, newsk); + newsk->sk_v6_rcv_saddr = sk->sk_v6_rcv_saddr;sk_refcnt_debug_inc (newsk);
This fixes the issue for the accept() case, but the bug is still there in the peeloff case.
I think you should make sctp_copy_sock() use sock_copy() for now. It looks like it will catch all the cases.
We can then look at possibly getting rid of sctp_copy_sock() for net-next.
-vlad
Quoted 39 lines · Vlad Yasevich
Quoted 27 lines · Daniel Borkmann
Wang reported an issue that lksctp's
test_getname_v6seems to fail.The issue is that we do not copy
sk_v6_rcv_saddrover to the new socket, although the comment above says so regardingrcv_saddr.Commit
914e1c8b6980("sctp: Inherit all socket options from parent correctly.") originally moved that over tosctp_copy_sock(), but after commitefe4208f47f9("ipv6: make lookups simpler and faster") this no longer holds and the actual value ofsk_v6_rcv_saddrwas no longer being migrated.With this patch, the lksctp test suite passes again for IPv6.
Fixes efe4208f47f9 ("ipv6: make lookups simpler and faster")Signed-off-by Daniel Borkmann <[email protected]>Signed-off-by Wang Weidong <[email protected]>Cc Eric Dumazet <[email protected]>--- net/sctp/ipv6.c | 1 + 1 file changed, 1 insertion(+)net/sctp/ipv6.c +0
-0net/sctp/ipv6.c static struct sock *sctp_v6_create_accept_sk(struct sock *sk, · line 667
Quoted 7 lines
net/sctp/ipv6.c +1
-0@@ -661,6 +661,7 @@ static struct sock *sctp_v6_create_accept_sk(struct sock *sk,* and getpeername(). */ sctp_v6_to_sk_daddr (&asoc->peer.primary_addr, newsk); + newsk->sk_v6_rcv_saddr = sk->sk_v6_rcv_saddr;sk_refcnt_debug_inc (newsk);This fixes the issue for the
accept()case, but the bug is still there in the peeloff case.
Quoted 2 lines
I think you should make
sctp_copy_sock()usesock_copy()for now. It looks like it will catch all the cases.
I tried that and my machine froze when running lksctp. ;-)
Currently a bit busy, so I need to get back to this later tonight.
Quoted 3 lines
We can then look at possibly getting rid of
sctp_copy_sock()for net-next.-vlad
David Miller
maintainerFrom: Vlad Yasevich <[email protected]>
Date: Tue, 19 Nov 2013 10:38:10 -0500
Quoted 7 lines
This fixes the issue for the
accept()case, but the bug is still there in the peeloff case.I think you should make
sctp_copy_sock()usesock_copy()for now. It looks like it will catch all the cases.We can then look at possibly getting rid of
sctp_copy_sock()for net-next.
Agreed, it looks like a lot of hair exists because sctp tries to use custom code to copy sockets. Getting away from this will fix this address problem as well as things like the pacing rate being wrong as Eric Dumazet mentioned.
Quoted 39 lines · Vlad Yasevich
Quoted 27 lines · Daniel Borkmann
Wang reported an issue that lksctp's
test_getname_v6seems to fail.The issue is that we do not copy
sk_v6_rcv_saddrover to the new socket, although the comment above says so regardingrcv_saddr.Commit
914e1c8b6980("sctp: Inherit all socket options from parent correctly.") originally moved that over tosctp_copy_sock(), but after commitefe4208f47f9("ipv6: make lookups simpler and faster") this no longer holds and the actual value ofsk_v6_rcv_saddrwas no longer being migrated.With this patch, the lksctp test suite passes again for IPv6.
Fixes efe4208f47f9 ("ipv6: make lookups simpler and faster")Signed-off-by Daniel Borkmann <[email protected]>Signed-off-by Wang Weidong <[email protected]>Cc Eric Dumazet <[email protected]>--- net/sctp/ipv6.c | 1 + 1 file changed, 1 insertion(+)net/sctp/ipv6.c +0
-0net/sctp/ipv6.c static struct sock *sctp_v6_create_accept_sk(struct sock *sk, · line 667
Quoted 7 lines
net/sctp/ipv6.c +1
-0@@ -661,6 +661,7 @@ static struct sock *sctp_v6_create_accept_sk(struct sock *sk,* and getpeername(). */ sctp_v6_to_sk_daddr (&asoc->peer.primary_addr, newsk); + newsk->sk_v6_rcv_saddr = sk->sk_v6_rcv_saddr;sk_refcnt_debug_inc (newsk);This fixes the issue for the
accept()case, but the bug is still there in the peeloff case.
Quoted 3 lines
I think you should make
sctp_copy_sock()usesock_copy()for now. It looks like it will catch all the cases.
I copied the part of the sock_copy() codes into sctp_v6_create_accept_sk instead of sctp_copy_sock for testing. Like this:
--------------
@@ -645,7 +645,11 @@ static struct sock *sctp_v6_create_accept_sk(struct sock *sk,
sock_init_data(NULL, newsk);
- sctp_copy_sock(newsk, sk, asoc);
+ memcpy(newsk, sk, offsetof(struct sock, sk_dontcopy_begin));
+
+ memcpy(&newsk->sk_dontcopy_end, &sk->sk_dontcopy_end,
+ sk->sk_prot->obj_size - offsetof(struct sock, sk_dontcopy_end));
+
sock_reset_flag(sk, SOCK_ZAPPED);
newsctp6sk = (struct sctp6_sock *)newsk;--------------
when I did the test_getname_v6 of lksctp tools. It would hang. And I used the ps aux, I can see the process got a D+ STAT.
BTW, I test it in the virtual machine.
So I think: when we use the sock_copy or which calls it, maybe we will get the problem here. Is there I do something wrong?
Thanks.
Quoted 6 lines
We can then look at possibly getting rid of
sctp_copy_sock()for net-next.-vlad
Quoted 65 lines · wangweidong
Quoted 39 lines · Vlad Yasevich
Quoted 27 lines · Daniel Borkmann
Wang reported an issue that lksctp's
test_getname_v6seems to fail.The issue is that we do not copy
sk_v6_rcv_saddrover to the new socket, although the comment above says so regardingrcv_saddr.Commit
914e1c8b6980("sctp: Inherit all socket options from parent correctly.") originally moved that over tosctp_copy_sock(), but after commitefe4208f47f9("ipv6: make lookups simpler and faster") this no longer holds and the actual value ofsk_v6_rcv_saddrwas no longer being migrated.With this patch, the lksctp test suite passes again for IPv6.
Fixes efe4208f47f9 ("ipv6: make lookups simpler and faster")Signed-off-by Daniel Borkmann <[email protected]>Signed-off-by Wang Weidong <[email protected]>Cc Eric Dumazet <[email protected]>--- net/sctp/ipv6.c | 1 + 1 file changed, 1 insertion(+)net/sctp/ipv6.c +0
-0net/sctp/ipv6.c static struct sock *sctp_v6_create_accept_sk(struct sock *sk, · line 667
Quoted 7 lines
net/sctp/ipv6.c +1
-0@@ -661,6 +661,7 @@ static struct sock *sctp_v6_create_accept_sk(struct sock *sk,* and getpeername(). */ sctp_v6_to_sk_daddr (&asoc->peer.primary_addr, newsk); + newsk->sk_v6_rcv_saddr = sk->sk_v6_rcv_saddr;sk_refcnt_debug_inc (newsk);This fixes the issue for the
accept()case, but the bug is still there in the peeloff case.Quoted 3 lines
I think you should make
sctp_copy_sock()usesock_copy()for now. It looks like it will catch all the cases.I copied the part of the
sock_copy()codes intosctp_v6_create_accept_skinstead ofsctp_copy_sockfor testing. Like this:--------------
(quoted diff) +5
-2@@ -645,7 +645,11 @@ static struct sock *sctp_v6_create_accept_sk(struct sock *sk, sock_init_data(NULL, newsk); - sctp_copy_sock(newsk, sk, asoc); + memcpy(newsk, sk, offsetof(struct sock, sk_dontcopy_begin)); + + memcpy(&newsk->sk_dontcopy_end, &sk->sk_dontcopy_end, + sk->sk_prot->obj_size - offsetof(struct sock, sk_dontcopy_end)); + sock_reset_flag(sk, SOCK_ZAPPED); newsctp6sk = (struct sctp6_sock *)newsk; --------------
Quoted 7 lines
when I did the
test_getname_v6of lksctp tools. It would hang. And I used the ps aux, I can see the process got a D+ STAT.BTW, I test it in the virtual machine.
So I think: when we use the
sock_copyor which calls it, maybe we will get the problem here. Is there I do something wrong?
Sorry, got distracted with other things in the mean time.
I will have a closer look at it very soon, so that we can find a proper fix.
Quoted 15 lines
Thanks.
Quoted 6 lines
We can then look at possibly getting rid of
sctp_copy_sock()for net-next.-vlad
--
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html