sctp: not copy sctp_sock pd_lobby in sctp_copy_descendant

[linux.git] / net / sctp / socket.c

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 533207dbeae955604a6304a8f67b65c9f580fd05..65b538604c5b531c7c4e32f9e59ea23d94967596 100644 (file)
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -102,9 +102,9 @@ 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,
-                             struct sctp_association *assoc,
-                             enum sctp_socket_type type);
+static int sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,
+                            struct sctp_association *assoc,
+                            enum sctp_socket_type type);
 
 static unsigned long sctp_memory_pressure;
 static atomic_long_t sctp_memory_allocated;
@@ -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;
 
@@ -9160,7 +9169,7 @@ static inline void sctp_copy_descendant(struct sock *sk_to,
 {
        int ancestor_size = sizeof(struct inet_sock) +
                            sizeof(struct sctp_sock) -
-                           offsetof(struct sctp_sock, auto_asconf_list);
+                           offsetof(struct sctp_sock, pd_lobby);
 
        if (sk_from->sk_family == PF_INET6)
                ancestor_size += sizeof(struct ipv6_pinfo);
@@ -9171,9 +9180,9 @@ 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,
-                             struct sctp_association *assoc,
-                             enum sctp_socket_type type)
+static int sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,
+                            struct sctp_association *assoc,
+                            enum sctp_socket_type type)
 {
        struct sctp_sock *oldsp = sctp_sk(oldsk);
        struct sctp_sock *newsp = sctp_sk(newsk);
@@ -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,20 @@ 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,
-                               &oldsp->ep->base.bind_addr, GFP_KERNEL);
+       err = sctp_bind_addr_dup(&newsp->ep->base.bind_addr,
+                                &oldsp->ep->base.bind_addr, GFP_KERNEL);
+       if (err)
+               return err;
+
+       /* New ep's auth_hmacs should be set if old ep's is set, in case
+        * that net->sctp.auth_enable has been changed to 0 by users and
+        * new ep's auth_hmacs couldn't be set in sctp_endpoint_init().
+        */
+       if (oldsp->ep->auth_hmacs) {
+               err = sctp_auth_init_hmacs(newsp->ep, 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.
@@ -9231,7 +9253,6 @@ static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,
         * 2) Peeling off partial delivery; keep pd_lobby in new pd_lobby.
         * 3) Peeling off non-partial delivery; move pd_lobby to receive_queue.
         */
-       skb_queue_head_init(&newsp->pd_lobby);
        atomic_set(&sctp_sk(newsk)->pd_mode, assoc->ulpq.pd_mode);
 
        if (atomic_read(&sctp_sk(oldsk)->pd_mode)) {
@@ -9296,6 +9317,8 @@ static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,
        }
 
        release_sock(newsk);
+
+       return 0;
 }