| Message ID | 20220409063611.673193-1-oss@malat.biz (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8467dda0c26583547731e7f3ea73fc3856bae3bf |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | sctp: Initialize daddr on peeled off socket | expand |
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Sat, 9 Apr 2022 08:36:11 +0200 you wrote: > Function sctp_do_peeloff() wrongly initializes daddr of the original > socket instead of the peeled off socket, which makes getpeername() > return zeroes instead of the primary address. Initialize the new socket > instead. > > Fixes: d570ee490fb1 ("[SCTP]: Correctly set daddr for IPv6 sockets during peeloff") > Signed-off-by: Petr Malat <oss@malat.biz> > Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> > > [...] Here is the summary with links: - sctp: Initialize daddr on peeled off socket https://git.kernel.org/netdev/net/c/8467dda0c265 You are awesome, thank you!
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 3e1a9600be5e..7b0427658056 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -5636,7 +5636,7 @@ int sctp_do_peeloff(struct sock *sk, sctp_assoc_t id, struct socket **sockp) * Set the daddr and initialize id to something more random and also * copy over any ip options. */ - sp->pf->to_sk_daddr(&asoc->peer.primary_addr, sk); + sp->pf->to_sk_daddr(&asoc->peer.primary_addr, sock->sk); sp->pf->copy_ip_options(sk, sock->sk); /* Populate the fields of the newsk from the oldsk and migrate the
Function sctp_do_peeloff() wrongly initializes daddr of the original socket instead of the peeled off socket, which makes getpeername() return zeroes instead of the primary address. Initialize the new socket instead. Fixes: d570ee490fb1 ("[SCTP]: Correctly set daddr for IPv6 sockets during peeloff") Signed-off-by: Petr Malat <oss@malat.biz> Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> --- net/sctp/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)