scsi: ufs: Use memset to initialize variable in ufshcd_crypto_keyslot_program
PATCH 1/2 scsi: ufs: Use memset to initialize variable in ufshcd_crypto_keyslot_program
Clang warns:
drivers/scsi/ufs/ufshcd-crypto.c:62:8: warning: missing braces around initializer [-Wmissing-braces]
union ufs_crypto_cfg_entry cfg = { 0 };
^--- drivers/scsi/ufs/ufshcd-crypto.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/ufs/ufshcd-crypto.c +3 -1
@@ -59,9 +59,11 @@ static int ufshcd_crypto_keyslot_program(struct blk_keyslot_manager *ksm,u8 data_unit_mask = key->crypto_cfg.data_unit_size /512 ;int i;int cap_idx =-1 ; -union ufs_crypto_cfg_entry cfg = {0 }; +union ufs_crypto_cfg_entry cfg;int err; +memset (&cfg,0 ,sizeof (cfg)); +BUILD_BUG_ON (UFS_CRYPTO_KEY_SIZE_INVALID !=0 );for (i =0 ; i < hba->crypto_capabilities.num_crypto_cap; i++) { if (ccap_array[i].algorithm_id == alg->ufs_alg &&
Signature · 1 line
2.18.1
PATCH 2/2 scsi: ufs: Use memset to initialize variable in ufshcd_clear_keyslot
Clang warns:
drivers/scsi/ufs/ufshcd-crypto.c:103:8: warning: missing braces around initializer [-Wmissing-braces]
union ufs_crypto_cfg_entry cfg = { 0 };
^--- drivers/scsi/ufs/ufshcd-crypto.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/ufs/ufshcd-crypto.c +3 -0
@@ -103,6 +103,9 @@ static int ufshcd_clear_keyslot(struct ufs_hba *hba, int slot)* might not be sufficient, so just clear the entire cfg. */ union ufs_crypto_cfg_entry cfg = {0 }; +union ufs_crypto_cfg_entry cfg; + +memset (&cfg,0 ,sizeof (cfg));return ufshcd_program_key (hba, &cfg, slot); }
Signature · 1 line
2.18.1
Quoted 6 lines · Pujin Shi
Clang warns:
drivers/scsi/ufs/ufshcd-crypto.c:62:8: warning: missing braces around initializer [-Wmissing-braces]union ufs_crypto_cfg_entry cfg = { 0 }; ^
Which version of clang? I don't see the warning with clang 10.0.1 (or with gcc 10.2.0).
Quoted 10 lines
Signed-off-by Pujin Shi <[email protected]>--- drivers/scsi/ufs/ufshcd-crypto.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/scsi/ufs/ufshcd-crypto.c +0
-0
drivers/scsi/ufs/ufshcd-crypto.c static int ufshcd_crypto_keyslot_program(struct blk_keyslot_manager *ksm, · line 66
Quoted 9 lines
drivers/scsi/ufs/ufshcd-crypto.c +3
-1@@ -59,9 +59,11 @@ static int ufshcd_crypto_keyslot_program(struct blk_keyslot_manager *ksm,u8 data_unit_mask = key->crypto_cfg.data_unit_size /512 ;int i;int cap_idx =-1 ; -union ufs_crypto_cfg_entry cfg = {0 }; +union ufs_crypto_cfg_entry cfg;int err; +memset (&cfg,0 ,sizeof (cfg)); +
How about an empty initializer?
union ufs_crypto_cfg_entry cfg = {};Same comments on your other patch.
- Eric