Commit 6b5ca646 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Herbert Xu
Browse files

crypto: testmgr - dynamically allocate testvec_config 



On arm32, we get warnings about high stack usage in some of the functions:

crypto/testmgr.c:2269:12: error: stack frame size of 1032 bytes in function 'alg_test_aead' [-Werror,-Wframe-larger-than=]
static int alg_test_aead(const struct alg_test_desc *desc, const char *driver,
           ^
crypto/testmgr.c:1693:12: error: stack frame size of 1312 bytes in function '__alg_test_hash' [-Werror,-Wframe-larger-than=]
static int __alg_test_hash(const struct hash_testvec *vecs,
           ^

On of the larger objects on the stack here is struct testvec_config, so
change that to dynamic allocation.

Fixes: 40153b10 ("crypto: testmgr - fuzz AEADs against their generic implementation")
Fixes: d435e10e ("crypto: testmgr - fuzz skciphers against their generic implementation")
Fixes: 9a8a6b3f ("crypto: testmgr - fuzz hashes against their generic implementation")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarEric Biggers <ebiggers@kernel.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent c8c74647

crypto/testmgr.c

+32 −11
Original line number Diff line number Diff line
@@ -1570,7 +1570,7 @@ static int test_hash_vs_generic_impl(const char *driver, 
	unsigned int i;

	struct hash_testvec vec = { 0 };

	char vec_name[64];

	struct testvec_config cfg;

	struct testvec_config *cfg;

	char cfgname[TESTVEC_CONFIG_NAMELEN];

	int err;
@@ -1600,6 +1600,12 @@ static int test_hash_vs_generic_impl(const char *driver, 
		return err;

	}



	cfg = kzalloc(sizeof(*cfg), GFP_KERNEL);

	if (!cfg) {

		err = -ENOMEM;

		goto out;

	}



	/* Check the algorithm properties for consistency. */



	if (digestsize != crypto_shash_digestsize(generic_tfm)) {
@@ -1634,9 +1640,9 @@ static int test_hash_vs_generic_impl(const char *driver, 
		generate_random_hash_testvec(generic_tfm, &vec,

					     maxkeysize, maxdatasize,

					     vec_name, sizeof(vec_name));

		generate_random_testvec_config(&cfg, cfgname, sizeof(cfgname));

		generate_random_testvec_config(cfg, cfgname, sizeof(cfgname));



		err = test_hash_vec_cfg(driver, &vec, vec_name, &cfg,

		err = test_hash_vec_cfg(driver, &vec, vec_name, cfg,

					req, desc, tsgl, hashstate);

		if (err)

			goto out;
@@ -1644,6 +1650,7 @@ static int test_hash_vs_generic_impl(const char *driver, 
	}

	err = 0;

out:

	kfree(cfg);

	kfree(vec.key);

	kfree(vec.plaintext);

	kfree(vec.digest);
@@ -2140,7 +2147,7 @@ static int test_aead_vs_generic_impl(const char *driver, 
	unsigned int i;

	struct aead_testvec vec = { 0 };

	char vec_name[64];

	struct testvec_config cfg;

	struct testvec_config *cfg;

	char cfgname[TESTVEC_CONFIG_NAMELEN];

	int err;
@@ -2170,6 +2177,12 @@ static int test_aead_vs_generic_impl(const char *driver, 
		return err;

	}



	cfg = kzalloc(sizeof(*cfg), GFP_KERNEL);

	if (!cfg) {

		err = -ENOMEM;

		goto out;

	}



	generic_req = aead_request_alloc(generic_tfm, GFP_KERNEL);

	if (!generic_req) {

		err = -ENOMEM;
@@ -2224,13 +2237,13 @@ static int test_aead_vs_generic_impl(const char *driver, 
		generate_random_aead_testvec(generic_req, &vec,

					     maxkeysize, maxdatasize,

					     vec_name, sizeof(vec_name));

		generate_random_testvec_config(&cfg, cfgname, sizeof(cfgname));

		generate_random_testvec_config(cfg, cfgname, sizeof(cfgname));



		err = test_aead_vec_cfg(driver, ENCRYPT, &vec, vec_name, &cfg,

		err = test_aead_vec_cfg(driver, ENCRYPT, &vec, vec_name, cfg,

					req, tsgls);

		if (err)

			goto out;

		err = test_aead_vec_cfg(driver, DECRYPT, &vec, vec_name, &cfg,

		err = test_aead_vec_cfg(driver, DECRYPT, &vec, vec_name, cfg,

					req, tsgls);

		if (err)

			goto out;
@@ -2238,6 +2251,7 @@ static int test_aead_vs_generic_impl(const char *driver, 
	}

	err = 0;

out:

	kfree(cfg);

	kfree(vec.key);

	kfree(vec.iv);

	kfree(vec.assoc);
@@ -2687,7 +2701,7 @@ static int test_skcipher_vs_generic_impl(const char *driver, 
	unsigned int i;

	struct cipher_testvec vec = { 0 };

	char vec_name[64];

	struct testvec_config cfg;

	struct testvec_config *cfg;

	char cfgname[TESTVEC_CONFIG_NAMELEN];

	int err;
@@ -2721,6 +2735,12 @@ static int test_skcipher_vs_generic_impl(const char *driver, 
		return err;

	}



	cfg = kzalloc(sizeof(*cfg), GFP_KERNEL);

	if (!cfg) {

		err = -ENOMEM;

		goto out;

	}



	generic_req = skcipher_request_alloc(generic_tfm, GFP_KERNEL);

	if (!generic_req) {

		err = -ENOMEM;
@@ -2768,20 +2788,21 @@ static int test_skcipher_vs_generic_impl(const char *driver, 
	for (i = 0; i < fuzz_iterations * 8; i++) {

		generate_random_cipher_testvec(generic_req, &vec, maxdatasize,

					       vec_name, sizeof(vec_name));

		generate_random_testvec_config(&cfg, cfgname, sizeof(cfgname));

		generate_random_testvec_config(cfg, cfgname, sizeof(cfgname));



		err = test_skcipher_vec_cfg(driver, ENCRYPT, &vec, vec_name,

					    &cfg, req, tsgls);

					    cfg, req, tsgls);

		if (err)

			goto out;

		err = test_skcipher_vec_cfg(driver, DECRYPT, &vec, vec_name,

					    &cfg, req, tsgls);

					    cfg, req, tsgls);

		if (err)

			goto out;

		cond_resched();

	}

	err = 0;

out:

	kfree(cfg);

	kfree(vec.key);

	kfree(vec.iv);

	kfree(vec.ptext);

CRA Git | Maintained and supported by SUSTech CRA and CCSE