sctp: delete the nested flexible array peer_init

This patch deletes the flexible-array peer_init[] from the structure
sctp_cookie to avoid some sparse warnings:

  # make C=2 CF="-Wflexible-array-nested" M=./net/sctp/
  net/sctp/sm_make_chunk.c: note: in included file (through include/net/sctp/sctp.h):
  ./include/net/sctp/structs.h:1588:28: warning: nested flexible array
  ./include/net/sctp/structs.h:343:28: warning: nested flexible array

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

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 070c9458fff4d9ab9c5caeade0b468d046179db0..5c72d1864dd6caff8ea2370d1c70116e08199368 100644 (file)
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -332,7 +332,7 @@ struct sctp_cookie {
         * the association TCB is re-constructed from the cookie.
         */
        __u32 raw_addr_list_len;
-       struct sctp_init_chunk peer_init[];
+       /* struct sctp_init_chunk peer_init[]; */
 };
 
 

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index 63ba5551c13fc397daa10ef2eeaf786e83951f6d..796529167e8d2fd23bc9e0afd5e0a0ff7e92848e 100644 (file)
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -1597,9 +1597,10 @@ int sctp_assoc_set_bind_addr_from_cookie(struct sctp_association *asoc,
                                         struct sctp_cookie *cookie,
                                         gfp_t gfp)
 {
-       int var_size2 = ntohs(cookie->peer_init->chunk_hdr.length);
+       struct sctp_init_chunk *peer_init = (struct sctp_init_chunk *)(cookie + 1);
+       int var_size2 = ntohs(peer_init->chunk_hdr.length);
        int var_size3 = cookie->raw_addr_list_len;
-       __u8 *raw = (__u8 *)cookie->peer_init + var_size2;
+       __u8 *raw = (__u8 *)peer_init + var_size2;
 
        return sctp_raw_to_bind_addrs(&asoc->base.bind_addr, raw, var_size3,
                                      asoc->ep->base.bind_addr.port, gfp);

diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 4dbbbc2a7742d8f1c9f785037631c3fb160d7de0..08527d882e56ef79b895ad46667061b68501df65 100644 (file)
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -1707,11 +1707,11 @@ static struct sctp_cookie_param *sctp_pack_cookie(
                                         ktime_get_real());
 
        /* Copy the peer's init packet.  */
-       memcpy(&cookie->c.peer_init[0], init_chunk->chunk_hdr,
+       memcpy(cookie + 1, init_chunk->chunk_hdr,
               ntohs(init_chunk->chunk_hdr->length));
 
        /* Copy the raw local address list of the association. */
-       memcpy((__u8 *)&cookie->c.peer_init[0] +
+       memcpy((__u8 *)(cookie + 1) +
               ntohs(init_chunk->chunk_hdr->length), raw_addrs, addrs_len);
 
        if (sctp_sk(ep->base.sk)->hmac) {

diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 8d0cfd689b205c02806c8a414263e007227aa4c2..7b8eb735fa88b576b5001aa833399300192546c9 100644 (file)
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -794,8 +794,7 @@ enum sctp_disposition sctp_sf_do_5_1D_ce(struct net *net,
        /* This is a brand-new association, so these are not yet side
         * effects--it is safe to run them here.
         */
-       peer_init = &chunk->subh.cookie_hdr->c.peer_init[0];
-
+       peer_init = (struct sctp_init_chunk *)(chunk->subh.cookie_hdr + 1);
        if (!sctp_process_init(new_asoc, chunk,
                               &chunk->subh.cookie_hdr->c.peer_addr,
                               peer_init, GFP_ATOMIC))
@@ -1869,8 +1868,7 @@ static enum sctp_disposition sctp_sf_do_dupcook_a(
        /* new_asoc is a brand-new association, so these are not yet
         * side effects--it is safe to run them here.
         */
-       peer_init = &chunk->subh.cookie_hdr->c.peer_init[0];
-
+       peer_init = (struct sctp_init_chunk *)(chunk->subh.cookie_hdr + 1);
        if (!sctp_process_init(new_asoc, chunk, sctp_source(chunk), peer_init,
                               GFP_ATOMIC))
                goto nomem;
@@ -1990,7 +1988,7 @@ static enum sctp_disposition sctp_sf_do_dupcook_b(
        /* new_asoc is a brand-new association, so these are not yet
         * side effects--it is safe to run them here.
         */
-       peer_init = &chunk->subh.cookie_hdr->c.peer_init[0];
+       peer_init = (struct sctp_init_chunk *)(chunk->subh.cookie_hdr + 1);
        if (!sctp_process_init(new_asoc, chunk, sctp_source(chunk), peer_init,
                               GFP_ATOMIC))
                goto nomem;