Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4243cac1 authored by Vladislav Yasevich's avatar Vladislav Yasevich Committed by David S. Miller
Browse files

[SCTP]: Fix bug in restart of peeled-off associations. 



Signed-off-by: default avatarVladislav Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: default avatarSridhar Samudrala <sri@us.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 77bd9196

net/sctp/socket.c

+12 −0
Original line number Diff line number Diff line
@@ -4686,6 +4686,7 @@ static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk, 
	struct sctp_endpoint *newep = newsp->ep;

	struct sk_buff *skb, *tmp;

	struct sctp_ulpevent *event;

	int flags = 0;



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

	 * new socket.
@@ -4707,6 +4708,17 @@ static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk, 
	sctp_sk(newsk)->bind_hash = pp;

	inet_sk(newsk)->num = inet_sk(oldsk)->num;



	/* Copy the bind_addr list from the original endpoint to the new

	 * endpoint so that we can handle restarts properly

	 */

	if (assoc->peer.ipv4_address)

		flags |= SCTP_ADDR4_PEERSUPP;

	if (assoc->peer.ipv6_address)

		flags |= SCTP_ADDR6_PEERSUPP;

	sctp_bind_addr_copy(&newsp->ep->base.bind_addr,

			     &oldsp->ep->base.bind_addr,

			     SCTP_SCOPE_GLOBAL, GFP_KERNEL, flags);



	/* Move any messages in the old socket's receive queue that are for the

	 * peeled off association to the new socket's receive queue.

	 */