Commit 89664c62 authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

sctp: sctp_sock_migrate() returns error if sctp_bind_addr_dup() fails 



It should fail to create the new sk if sctp_bind_addr_dup() fails
when accepting or peeloff an association.

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ad6c9986

net/sctp/socket.c

+24 −10
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static int sctp_send_asconf(struct sctp_association *asoc, 
			    struct sctp_chunk *chunk);

static int sctp_do_bind(struct sock *, union sctp_addr *, int);

static int sctp_autobind(struct sock *sk);

static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,

static int sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,

			     struct sctp_association *assoc,

			     enum sctp_socket_type type);
@@ -4891,7 +4891,11 @@ static struct sock *sctp_accept(struct sock *sk, int flags, int *err, bool kern) 
	/* Populate the fields of the newsk from the oldsk and migrate the

	 * asoc to the newsk.

	 */

	sctp_sock_migrate(sk, newsk, asoc, SCTP_SOCKET_TCP);

	error = sctp_sock_migrate(sk, newsk, asoc, SCTP_SOCKET_TCP);

	if (error) {

		sk_common_release(newsk);

		newsk = NULL;

	}



out:

	release_sock(sk);
@@ -5639,7 +5643,12 @@ int sctp_do_peeloff(struct sock *sk, sctp_assoc_t id, struct socket **sockp) 
	/* Populate the fields of the newsk from the oldsk and migrate the

	 * asoc to the newsk.

	 */

	sctp_sock_migrate(sk, sock->sk, asoc, SCTP_SOCKET_UDP_HIGH_BANDWIDTH);

	err = sctp_sock_migrate(sk, sock->sk, asoc,

				SCTP_SOCKET_UDP_HIGH_BANDWIDTH);

	if (err) {

		sock_release(sock);

		sock = NULL;

	}



	*sockp = sock;
@@ -9171,7 +9180,7 @@ static inline void sctp_copy_descendant(struct sock *sk_to, 
/* Populate the fields of the newsk from the oldsk and migrate the assoc

 * and its messages to the newsk.

 */

static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,

static int sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,

			     struct sctp_association *assoc,

			     enum sctp_socket_type type)

{
@@ -9182,6 +9191,7 @@ static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk, 
	struct sk_buff *skb, *tmp;

	struct sctp_ulpevent *event;

	struct sctp_bind_hashbucket *head;

	int err;



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

	 * new socket.
@@ -9210,8 +9220,10 @@ static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk, 
	/* Copy the bind_addr list from the original endpoint to the new

	 * endpoint so that we can handle restarts properly

	 */

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

	err = sctp_bind_addr_dup(&newsp->ep->base.bind_addr,

				 &oldsp->ep->base.bind_addr, GFP_KERNEL);

	if (err)

		return err;



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

	 * peeled off association to the new socket's receive queue.
@@ -9296,6 +9308,8 @@ static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk, 
	}



	release_sock(newsk);



	return 0;

}