Commit 2d4df59a authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Jakub Kicinski
Browse files

sctp: Don't copy sk_sndbuf and sk_rcvbuf in sctp_sock_migrate(). 



sctp_sock_migrate() is called from 2 places.

1) sctp_accept() calls sp->pf->create_accept_sk() before
   sctp_sock_migrate(), and sp->pf->create_accept_sk() calls
   sctp_copy_sock().

2) sctp_do_peeloff() also calls sctp_copy_sock() before
   sctp_sock_migrate().

sctp_copy_sock() copies sk_sndbuf and sk_rcvbuf from the
parent socket.

Let's not copy the two fields in sctp_sock_migrate().

Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@google.com>
Acked-by: default avatarXin Long <lucien.xin@gmail.com>
Link: https://patch.msgid.link/20251023231751.4168390-3-kuniyu@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 622e8838

net/sctp/socket.c

+2 −5
Original line number Diff line number Diff line
@@ -9523,12 +9523,9 @@ static int sctp_sock_migrate(struct sock *oldsk, struct sock *newsk, 
	struct sctp_bind_hashbucket *head;

	int err;



	/* Migrate socket buffer sizes and all the socket level options to the

	 * new socket.

	/* Migrate all the socket level options to the new socket.

	 * Brute force copy old sctp opt.

	 */

	newsk->sk_sndbuf = oldsk->sk_sndbuf;

	newsk->sk_rcvbuf = oldsk->sk_rcvbuf;

	/* Brute force copy old sctp opt. */

	sctp_copy_descendant(newsk, oldsk);



	/* Restore the ep value that was overwritten with the above structure