tools/testing/crypto: Use vzalloc instead of vmalloc+memset

This fixes the corresponding coccinelle warning.

Signed-off-by Siddh Raman Pant <[email protected]>

---
 tools/testing/crypto/chacha20-s390/test-cipher.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

tools/testing/crypto/chacha20-s390/test-cipher.c +2 -5

index 34e8b855266f..8141d45df51a 100644
@@ -252,29 +252,26 @@ static int __init chacha_s390_test_init(void)
 	memset(plain, 'a', data_size);
 	get_random_bytes(plain, (data_size > 256 ? 256 : data_size));
 
-	cipher_generic = vmalloc(data_size);
+	cipher_generic = vzalloc(data_size);
 	if (!cipher_generic) {
 		pr_info("could not allocate cipher_generic buffer\n");
 		ret = -2;
 		goto out;
 	}
-	memset(cipher_generic, 0, data_size);
 
-	cipher_s390 = vmalloc(data_size);
+	cipher_s390 = vzalloc(data_size);
 	if (!cipher_s390) {
 		pr_info("could not allocate cipher_s390 buffer\n");
 		ret = -2;
 		goto out;
 	}
-	memset(cipher_s390, 0, data_size);
 
-	revert = vmalloc(data_size);

Quoted 35 lines · Siddh Raman Pant

This fixes the corresponding coccinelle warning.

Signed-off-by Siddh Raman Pant <[email protected]>

---
 tools/testing/crypto/chacha20-s390/test-cipher.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

tools/testing/crypto/chacha20-s390/test-cipher.c +2 -5

index 34e8b855266f..8141d45df51a 100644
@@ -252,29 +252,26 @@ static int __init chacha_s390_test_init(void)
      memset(plain, 'a', data_size);
      get_random_bytes(plain, (data_size > 256 ? 256 : data_size));
 
-     cipher_generic = vmalloc(data_size);
+     cipher_generic = vzalloc(data_size);
      if (!cipher_generic) {
              pr_info("could not allocate cipher_generic buffer\n");
              ret = -2;
              goto out;
      }
-     memset(cipher_generic, 0, data_size);
 
-     cipher_s390 = vmalloc(data_size);
+     cipher_s390 = vzalloc(data_size);
      if (!cipher_s390) {
              pr_info("could not allocate cipher_s390 buffer\n");
              ret = -2;
              goto out;
      }
-     memset(cipher_s390, 0, data_size);
 
-     revert = vmalloc(data_size);

tools/testing/crypto/chacha20-s390/test-cipher.c static int __init chacha_s390_test_init(void) · line 277

Quoted 10 lines

tools/testing/crypto/chacha20-s390/test-cipher.c +1 -1

+     revert = vzalloc(data_size);
      if (!revert) {
              pr_info("could not allocate revert buffer\n");
              ret = -2;
              goto out;
      }
-     memset(revert, 0, data_size);
 
      if (debug)
              print_hex_dump(KERN_INFO, "src: ", DUMP_PREFIX_OFFSET,

Thanks Siddh
I'll forward this patch into the s390 subsystem and on the next merge window for the 5.20 kernel then it will appear in the upstream kernel.

Thanks, Siddh,

This change makes perfect sense.

Thanks Siddh
I'll forward this patch into the s390 subsystem and on the next merge window for the 5.20 kernel then it will appear in the upstream kernel.