s390/zcrypt: rework arrays with length zero occurrences

Review and rework all the zero length array occurrences
within structs to flexible array fields or comment if
not used at all. However, some struct fields are there
for documentation purpose or to have correct sizeof()
evaluation of a struct and thus should not get deleted.

Signed-off-by: Harald Freudenberger <freude@linux.ibm.com>
Acked-by: Heiko Carstens <hca@linux.ibm.com>
Reviewed-by: Holger Dengler <dengler@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/drivers/s390/crypto/zcrypt_cca_key.h b/drivers/s390/crypto/zcrypt_cca_key.h
index 5d68b61c9fe1e9e8d65faf8702b67c0d75579c9d..f5907b67db29fce9328a8a34b43a3c33aae29a02 100644 (file)
--- a/drivers/s390/crypto/zcrypt_cca_key.h
+++ b/drivers/s390/crypto/zcrypt_cca_key.h
@@ -168,7 +168,7 @@ static inline int zcrypt_type6_crt_key(struct ica_rsa_modexpo_crt *crt, void *p)
                struct t6_keyblock_hdr t6_hdr;
                struct cca_token_hdr token;
                struct cca_pvt_ext_crt_sec pvt;
-               char key_parts[0];
+               char key_parts[];
        } __packed *key = p;
        struct cca_public_sec *pub;
        int short_len, long_len, pad_len, key_len, size;

diff --git a/drivers/s390/crypto/zcrypt_ccamisc.c b/drivers/s390/crypto/zcrypt_ccamisc.c
index 60ba20a133bed0b7ed263210fae90b9efffa3c10..8c8808cc68a44fcd161f4df4e39fa78d3eba1275 100644 (file)
--- a/drivers/s390/crypto/zcrypt_ccamisc.c
+++ b/drivers/s390/crypto/zcrypt_ccamisc.c
@@ -450,18 +450,18 @@ int cca_clr2seckey(u16 cardnr, u16 domain, u32 keybitsize,
                char  rule_array[8];
                struct lv1 {
                        u16 len;
-                       u8  clrkey[0];
+                       u8  clrkey[];
                } lv1;
-               struct lv2 {
-                       u16 len;
-                       struct keyid {
-                               u16 len;
-                               u16 attr;
-                               u8  data[SECKEYBLOBSIZE];
-                       } keyid;
-               } lv2;
+               /* followed by struct lv2 */
        } __packed * preqparm;
-       struct lv2 *plv2;
+       struct lv2 {
+               u16 len;
+               struct keyid {
+                       u16 len;
+                       u16 attr;
+                       u8  data[SECKEYBLOBSIZE];
+               } keyid;
+       } __packed * plv2;
        struct cmrepparm {
                u8  subfunc_code[2];
                u16 rule_array_len;
@@ -512,11 +512,11 @@ int cca_clr2seckey(u16 cardnr, u16 domain, u32 keybitsize,
        }
        preqparm->lv1.len = sizeof(struct lv1) + keysize;
        memcpy(preqparm->lv1.clrkey, clrkey, keysize);
-       plv2 = (struct lv2 *)(((u8 *)&preqparm->lv2) + keysize);
+       plv2 = (struct lv2 *)(((u8 *)preqparm) + sizeof(*preqparm) + keysize);
        plv2->len = sizeof(struct lv2);
        plv2->keyid.len = sizeof(struct keyid);
        plv2->keyid.attr = 0x30;
-       preqcblk->req_parml = sizeof(struct cmreqparm) + keysize;
+       preqcblk->req_parml = sizeof(*preqparm) + keysize + sizeof(*plv2);
 
        /* fill xcrb struct */
        prep_xcrb(&xcrb, cardnr, preqcblk, prepcblk);
@@ -761,22 +761,22 @@ int cca_gencipherkey(u16 cardnr, u16 domain, u32 keybitsize, u32 keygenflags,
                        u16 key_name_2_len;
                        u16 user_data_1_len;
                        u16 user_data_2_len;
-                       u8  key_name_1[0];
-                       u8  key_name_2[0];
-                       u8  user_data_1[0];
-                       u8  user_data_2[0];
+                       /* u8  key_name_1[]; */
+                       /* u8  key_name_2[]; */
+                       /* u8  user_data_1[]; */
+                       /* u8  user_data_2[]; */
                } vud;
                struct {
                        u16 len;
                        struct {
                                u16 len;
                                u16 flag;
-                               u8  kek_id_1[0];
+                               /* u8  kek_id_1[]; */
                        } tlv1;
                        struct {
                                u16 len;
                                u16 flag;
-                               u8  kek_id_2[0];
+                               /* u8  kek_id_2[]; */
                        } tlv2;
                        struct {
                                u16 len;
@@ -786,17 +786,17 @@ int cca_gencipherkey(u16 cardnr, u16 domain, u32 keybitsize, u32 keygenflags,
                        struct {
                                u16 len;
                                u16 flag;
-                               u8  gen_key_id_1_label[0];
+                               /* u8  gen_key_id_1_label[]; */
                        } tlv4;
                        struct {
                                u16 len;
                                u16 flag;
-                               u8  gen_key_id_2[0];
+                               /* u8  gen_key_id_2[]; */
                        } tlv5;
                        struct {
                                u16 len;
                                u16 flag;
-                               u8  gen_key_id_2_label[0];
+                               /* u8  gen_key_id_2_label[]; */
                        } tlv6;
                } kb;
        } __packed * preqparm;
@@ -811,7 +811,7 @@ int cca_gencipherkey(u16 cardnr, u16 domain, u32 keybitsize, u32 keygenflags,
                        struct {
                                u16 len;
                                u16 flag;
-                               u8  gen_key[0]; /* 120-136 bytes */
+                               u8  gen_key[]; /* 120-136 bytes */
                        } tlv1;
                } kb;
        } __packed * prepparm;
@@ -955,7 +955,7 @@ static int _ip_cprb_helper(u16 cardnr, u16 domain,
        struct rule_array_block {
                u8  subfunc_code[2];
                u16 rule_array_len;
-               char rule_array[0];
+               char rule_array[];
        } __packed * preq_ra_block;
        struct vud_block {
                u16 len;
@@ -967,7 +967,7 @@ static int _ip_cprb_helper(u16 cardnr, u16 domain,
                struct {
                        u16 len;
                        u16 flag;       /* 0x0063 */
-                       u8  clr_key[0]; /* clear key value bytes */
+                       u8  clr_key[];  /* clear key value bytes */
                } tlv2;
        } __packed * preq_vud_block;
        struct key_block {
@@ -975,7 +975,7 @@ static int _ip_cprb_helper(u16 cardnr, u16 domain,
                struct {
                        u16 len;
                        u16 flag;         /* 0x0030 */
-                       u8  key_token[0]; /* key skeleton */
+                       u8  key_token[];  /* key skeleton */
                } tlv1;
        } __packed * preq_key_block;
        struct iprepparm {
@@ -989,7 +989,7 @@ static int _ip_cprb_helper(u16 cardnr, u16 domain,
                        struct {
                                u16 len;
                                u16 flag;         /* 0x0030 */
-                               u8  key_token[0]; /* key token */
+                               u8  key_token[];  /* key token */
                        } tlv1;
                } kb;
        } __packed * prepparm;
@@ -1201,7 +1201,7 @@ int cca_cipher2protkey(u16 cardnr, u16 domain, const u8 *ckey,
                        u16 len;
                        u16 cca_key_token_len;
                        u16 cca_key_token_flags;
-                       u8  cca_key_token[0]; // 64 or more
+                       u8  cca_key_token[]; /* 64 or more */
                } kb;
        } __packed * preqparm;
        struct aurepparm {
@@ -1370,7 +1370,7 @@ int cca_ecc2protkey(u16 cardnr, u16 domain, const u8 *key,
                        u16 len;
                        u16 cca_key_token_len;
                        u16 cca_key_token_flags;
-                       u8  cca_key_token[0];
+                       u8  cca_key_token[];
                } kb;
        } __packed * preqparm;
        struct aurepparm {
@@ -1387,17 +1387,15 @@ int cca_ecc2protkey(u16 cardnr, u16 domain, const u8 *key,
                                u8  form;
                                u8  pad1[3];
                                u16 keylen;
-                               u8  key[0];  /* the key (keylen bytes) */
-                               u16 keyattrlen;
-                               u8  keyattr[32];
-                               u8  pad2[1];
-                               u8  vptype;
-                               u8  vp[32];  /* verification pattern */
+                               u8  key[];  /* the key (keylen bytes) */
+                               /* u16 keyattrlen; */
+                               /* u8  keyattr[32]; */
+                               /* u8  pad2[1]; */
+                               /* u8  vptype; */
+                               /* u8  vp[32];  verification pattern */
                        } ckb;
                } vud;
-               struct {
-                       u16 len;
-               } kb;
+               /* followed by a key block */
        } __packed * prepparm;
        int keylen = ((struct eccprivkeytoken *)key)->len;
 
@@ -1525,7 +1523,7 @@ int cca_query_crypto_facility(u16 cardnr, u16 domain,
        size_t parmbsize = sizeof(struct fqreqparm);
        struct fqrepparm {
                u8  subfunc_code[2];
-               u8  lvdata[0];
+               u8  lvdata[];
        } __packed * prepparm;
 
        /* get already prepared memory for 2 cprbs with param block each */

diff --git a/drivers/s390/crypto/zcrypt_ep11misc.c b/drivers/s390/crypto/zcrypt_ep11misc.c
index b1c29017be5bcf8d42247af6bc1cce6b06371ea4..f67d19d08571ba20d182bf9f3d78b5ca72068dd4 100644 (file)
--- a/drivers/s390/crypto/zcrypt_ep11misc.c
+++ b/drivers/s390/crypto/zcrypt_ep11misc.c
@@ -1275,7 +1275,7 @@ int ep11_kblob2protkey(u16 card, u16 dom, const u8 *keyblob, size_t keybloblen,
                u32 pkeybitsize;
                u64 pkeysize;
                u8  res2[8];
-               u8  pkey[0];
+               u8  pkey[];
        } __packed * wki;
        const u8 *key;
        struct ep11kblob_header *hdr;

diff --git a/drivers/s390/crypto/zcrypt_msgtype6.c b/drivers/s390/crypto/zcrypt_msgtype6.c
index 7c7ff65608588ea8ee1a3546695bae3905e1014b..2f9bf23fbb44ebaa1b286f385aad4b2e8c5e7756 100644 (file)
--- a/drivers/s390/crypto/zcrypt_msgtype6.c
+++ b/drivers/s390/crypto/zcrypt_msgtype6.c
@@ -208,7 +208,7 @@ static int icamex_msg_to_type6mex_msgx(struct zcrypt_queue *zq,
                struct CPRBX cprbx;
                struct function_and_rules_block fr;
                unsigned short length;
-               char text[0];
+               char text[];
        } __packed * msg = ap_msg->msg;
        int size;
 
@@ -278,7 +278,7 @@ static int icacrt_msg_to_type6crt_msgx(struct zcrypt_queue *zq,
                struct CPRBX cprbx;
                struct function_and_rules_block fr;
                unsigned short length;
-               char text[0];
+               char text[];
        } __packed * msg = ap_msg->msg;
        int size;