sctp: add sctp_auth_init and sctp_auth_free

This patch is to factor out sctp_auth_init and sctp_auth_free
functions, and sctp_auth_init will also be used in the next
patch for SCTP_AUTH_SUPPORTED sockopt.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/sctp/auth.h b/include/net/sctp/auth.h
index caaae2de9099be62e7a333b8238809a10cc343a6..d4b3b2dcd15b733fba33fa3f5c83b4559015d1b2 100644 (file)
--- a/include/net/sctp/auth.h
+++ b/include/net/sctp/auth.h
@@ -107,5 +107,7 @@ int sctp_auth_del_key_id(struct sctp_endpoint *ep,
                         struct sctp_association *asoc, __u16 key_id);
 int sctp_auth_deact_key_id(struct sctp_endpoint *ep,
                           struct sctp_association *asoc, __u16 key_id);
+int sctp_auth_init(struct sctp_endpoint *ep, gfp_t gfp);
+void sctp_auth_free(struct sctp_endpoint *ep);
 
 #endif

diff --git a/net/sctp/auth.c b/net/sctp/auth.c
index 61b00904d830be078b5f5221b0b91f53fcf5a863..4278764d82b82731483c15023d81ce7b6fab4b9b 100644 (file)
--- a/net/sctp/auth.c
+++ b/net/sctp/auth.c
@@ -1007,3 +1007,72 @@ int sctp_auth_deact_key_id(struct sctp_endpoint *ep,
 
        return 0;
 }
+
+int sctp_auth_init(struct sctp_endpoint *ep, gfp_t gfp)
+{
+       int err = -ENOMEM;
+
+       /* Allocate space for HMACS and CHUNKS authentication
+        * variables.  There are arrays that we encode directly
+        * into parameters to make the rest of the operations easier.
+        */
+       if (!ep->auth_hmacs_list) {
+               struct sctp_hmac_algo_param *auth_hmacs;
+
+               auth_hmacs = kzalloc(struct_size(auth_hmacs, hmac_ids,
+                                                SCTP_AUTH_NUM_HMACS), gfp);
+               if (!auth_hmacs)
+                       goto nomem;
+               /* Initialize the HMACS parameter.
+                * SCTP-AUTH: Section 3.3
+                *    Every endpoint supporting SCTP chunk authentication MUST
+                *    support the HMAC based on the SHA-1 algorithm.
+                */
+               auth_hmacs->param_hdr.type = SCTP_PARAM_HMAC_ALGO;
+               auth_hmacs->param_hdr.length =
+                               htons(sizeof(struct sctp_paramhdr) + 2);
+               auth_hmacs->hmac_ids[0] = htons(SCTP_AUTH_HMAC_ID_SHA1);
+               ep->auth_hmacs_list = auth_hmacs;
+       }
+
+       if (!ep->auth_chunk_list) {
+               struct sctp_chunks_param *auth_chunks;
+
+               auth_chunks = kzalloc(sizeof(*auth_chunks) +
+                                     SCTP_NUM_CHUNK_TYPES, gfp);
+               if (!auth_chunks)
+                       goto nomem;
+               /* Initialize the CHUNKS parameter */
+               auth_chunks->param_hdr.type = SCTP_PARAM_CHUNKS;
+               auth_chunks->param_hdr.length =
+                               htons(sizeof(struct sctp_paramhdr));
+               ep->auth_chunk_list = auth_chunks;
+       }
+
+       /* Allocate and initialize transorms arrays for supported
+        * HMACs.
+        */
+       err = sctp_auth_init_hmacs(ep, gfp);
+       if (err)
+               goto nomem;
+
+       return 0;
+
+nomem:
+       /* Free all allocations */
+       kfree(ep->auth_hmacs_list);
+       kfree(ep->auth_chunk_list);
+       ep->auth_hmacs_list = NULL;
+       ep->auth_chunk_list = NULL;
+       return err;
+}
+
+void sctp_auth_free(struct sctp_endpoint *ep)
+{
+       kfree(ep->auth_hmacs_list);
+       kfree(ep->auth_chunk_list);
+       ep->auth_hmacs_list = NULL;
+       ep->auth_chunk_list = NULL;
+       sctp_auth_destroy_hmacs(ep->auth_hmacs);
+       ep->auth_hmacs = NULL;
+}

diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c
index 38b8d7cf8557b4a649ac37ba6f28430923b05c64..75a407df32c53b78aa4fd193aad616048210b83d 100644 (file)
--- a/net/sctp/endpointola.c
+++ b/net/sctp/endpointola.c
@@ -43,10 +43,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,
                                                gfp_t gfp)
 {
        struct net *net = sock_net(sk);
-       struct sctp_hmac_algo_param *auth_hmacs = NULL;
-       struct sctp_chunks_param *auth_chunks = NULL;
        struct sctp_shared_key *null_key;
-       int err;
 
        ep->digest = kzalloc(SCTP_SIGNATURE_SIZE, gfp);
        if (!ep->digest)
@@ -55,51 +52,12 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,
        ep->asconf_enable = net->sctp.addip_enable;
        ep->auth_enable = net->sctp.auth_enable;
        if (ep->auth_enable) {
-               /* Allocate space for HMACS and CHUNKS authentication
-                * variables.  There are arrays that we encode directly
-                * into parameters to make the rest of the operations easier.
-                */
-               auth_hmacs = kzalloc(struct_size(auth_hmacs, hmac_ids,
-                                                SCTP_AUTH_NUM_HMACS), gfp);
-               if (!auth_hmacs)
-                       goto nomem;
-
-               auth_chunks = kzalloc(sizeof(*auth_chunks) +
-                                     SCTP_NUM_CHUNK_TYPES, gfp);
-               if (!auth_chunks)
+               if (sctp_auth_init(ep, gfp))
                        goto nomem;
-
-               /* Initialize the HMACS parameter.
-                * SCTP-AUTH: Section 3.3
-                *    Every endpoint supporting SCTP chunk authentication MUST
-                *    support the HMAC based on the SHA-1 algorithm.
-                */
-               auth_hmacs->param_hdr.type = SCTP_PARAM_HMAC_ALGO;
-               auth_hmacs->param_hdr.length =
-                                       htons(sizeof(struct sctp_paramhdr) + 2);
-               auth_hmacs->hmac_ids[0] = htons(SCTP_AUTH_HMAC_ID_SHA1);
-
-               /* Initialize the CHUNKS parameter */
-               auth_chunks->param_hdr.type = SCTP_PARAM_CHUNKS;
-               auth_chunks->param_hdr.length =
-                                       htons(sizeof(struct sctp_paramhdr));
-
-               /* If the Add-IP functionality is enabled, we must
-                * authenticate, ASCONF and ASCONF-ACK chunks
-                */
                if (ep->asconf_enable) {
-                       auth_chunks->chunks[0] = SCTP_CID_ASCONF;
-                       auth_chunks->chunks[1] = SCTP_CID_ASCONF_ACK;
-                       auth_chunks->param_hdr.length =
-                                       htons(sizeof(struct sctp_paramhdr) + 2);
+                       sctp_auth_ep_add_chunkid(ep, SCTP_CID_ASCONF);
+                       sctp_auth_ep_add_chunkid(ep, SCTP_CID_ASCONF_ACK);
                }
-
-               /* Allocate and initialize transorms arrays for supported
-                * HMACs.
-                */
-               err = sctp_auth_init_hmacs(ep, gfp);
-               if (err)
-                       goto nomem;
        }
 
        /* Initialize the base structure. */
@@ -146,8 +104,6 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,
        /* Add the null key to the endpoint shared keys list and
         * set the hmcas and chunks pointers.
         */
-       ep->auth_hmacs_list = auth_hmacs;
-       ep->auth_chunk_list = auth_chunks;
        ep->prsctp_enable = net->sctp.prsctp_enable;
        ep->reconf_enable = net->sctp.reconf_enable;
 
@@ -158,11 +114,8 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,
        return ep;
 
 nomem_shkey:
-       sctp_auth_destroy_hmacs(ep->auth_hmacs);
+       sctp_auth_free(ep);
 nomem:
-       /* Free all allocations */
-       kfree(auth_hmacs);
-       kfree(auth_chunks);
        kfree(ep->digest);
        return NULL;
 
@@ -245,11 +198,7 @@ static void sctp_endpoint_destroy(struct sctp_endpoint *ep)
         * chunks and hmacs arrays that were allocated
         */
        sctp_auth_destroy_keys(&ep->endpoint_shared_keys);
-       kfree(ep->auth_hmacs_list);
-       kfree(ep->auth_chunk_list);
-
-       /* AUTH - Free any allocated HMAC transform containers */
-       sctp_auth_destroy_hmacs(ep->auth_hmacs);
+       sctp_auth_free(ep);
 
        /* Cleanup. */
        sctp_inq_free(&ep->base.inqueue);