Commit 42808e5d authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: hash - Count error stats differently 



Move all stat code specific to hash into the hash code.

While we're at it, change the stats so that bytes and counts
are always incremented even in case of error.  This allows the
reference counting to be removed as we can now increment the
counters prior to the operation.

After the operation we simply increase the error count if necessary.
This is safe as errors can only occur synchronously (or rather,
the existing code already ignored asynchronous errors which are
only visible to the callback function).

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 035d78a1

crypto/ahash.c

+48 −33
Original line number Diff line number Diff line
@@ -8,19 +8,18 @@ 
 * Copyright (c) 2008 Loc Ho <lho@amcc.com>

 */



#include <crypto/internal/hash.h>

#include <crypto/scatterwalk.h>

#include <linux/cryptouser.h>

#include <linux/err.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/sched.h>

#include <linux/slab.h>

#include <linux/seq_file.h>

#include <linux/cryptouser.h>

#include <linux/compiler.h>

#include <linux/string.h>

#include <net/netlink.h>



#include "internal.h"

#include "hash.h"



static const struct crypto_type crypto_ahash_type;
@@ -296,55 +295,60 @@ static int crypto_ahash_op(struct ahash_request *req, 
{

	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);

	unsigned long alignmask = crypto_ahash_alignmask(tfm);

	int err;



	if ((unsigned long)req->result & alignmask)

		return ahash_op_unaligned(req, op, has_state);

		err = ahash_op_unaligned(req, op, has_state);

	else

		err = op(req);



	return op(req);

	return crypto_hash_errstat(crypto_hash_alg_common(tfm), err);

}



int crypto_ahash_final(struct ahash_request *req)

{

	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);

	struct crypto_alg *alg = tfm->base.__crt_alg;

	unsigned int nbytes = req->nbytes;

	int ret;

	struct hash_alg_common *alg = crypto_hash_alg_common(tfm);



	crypto_stats_get(alg);

	ret = crypto_ahash_op(req, crypto_ahash_reqtfm(req)->final, true);

	crypto_stats_ahash_final(nbytes, ret, alg);

	return ret;

	if (IS_ENABLED(CONFIG_CRYPTO_STATS))

		atomic64_inc(&hash_get_stat(alg)->hash_cnt);



	return crypto_ahash_op(req, tfm->final, true);

}

EXPORT_SYMBOL_GPL(crypto_ahash_final);



int crypto_ahash_finup(struct ahash_request *req)

{

	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);

	struct crypto_alg *alg = tfm->base.__crt_alg;

	unsigned int nbytes = req->nbytes;

	int ret;

	struct hash_alg_common *alg = crypto_hash_alg_common(tfm);



	crypto_stats_get(alg);

	ret = crypto_ahash_op(req, crypto_ahash_reqtfm(req)->finup, true);

	crypto_stats_ahash_final(nbytes, ret, alg);

	return ret;

	if (IS_ENABLED(CONFIG_CRYPTO_STATS)) {

		struct crypto_istat_hash *istat = hash_get_stat(alg);



		atomic64_inc(&istat->hash_cnt);

		atomic64_add(req->nbytes, &istat->hash_tlen);

	}



	return crypto_ahash_op(req, tfm->finup, true);

}

EXPORT_SYMBOL_GPL(crypto_ahash_finup);



int crypto_ahash_digest(struct ahash_request *req)

{

	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);

	struct crypto_alg *alg = tfm->base.__crt_alg;

	unsigned int nbytes = req->nbytes;

	int ret;

	struct hash_alg_common *alg = crypto_hash_alg_common(tfm);



	if (IS_ENABLED(CONFIG_CRYPTO_STATS)) {

		struct crypto_istat_hash *istat = hash_get_stat(alg);



		atomic64_inc(&istat->hash_cnt);

		atomic64_add(req->nbytes, &istat->hash_tlen);

	}



	crypto_stats_get(alg);

	if (crypto_ahash_get_flags(tfm) & CRYPTO_TFM_NEED_KEY)

		ret = -ENOKEY;

	else

		ret = crypto_ahash_op(req, tfm->digest, false);

	crypto_stats_ahash_final(nbytes, ret, alg);

	return ret;

		return crypto_hash_errstat(alg, -ENOKEY);



	return crypto_ahash_op(req, tfm->digest, false);

}

EXPORT_SYMBOL_GPL(crypto_ahash_digest);
@@ -498,6 +502,12 @@ static void crypto_ahash_show(struct seq_file *m, struct crypto_alg *alg) 
		   __crypto_hash_alg_common(alg)->digestsize);

}



static int __maybe_unused crypto_ahash_report_stat(

	struct sk_buff *skb, struct crypto_alg *alg)

{

	return crypto_hash_report_stat(skb, alg, "ahash");

}



static const struct crypto_type crypto_ahash_type = {

	.extsize = crypto_ahash_extsize,

	.init_tfm = crypto_ahash_init_tfm,
@@ -506,6 +516,9 @@ static const struct crypto_type crypto_ahash_type = { 
	.show = crypto_ahash_show,

#endif

	.report = crypto_ahash_report,

#ifdef CONFIG_CRYPTO_STATS

	.report_stat = crypto_ahash_report_stat,

#endif

	.maskclear = ~CRYPTO_ALG_TYPE_MASK,

	.maskset = CRYPTO_ALG_TYPE_AHASH_MASK,

	.type = CRYPTO_ALG_TYPE_AHASH,
@@ -537,14 +550,16 @@ EXPORT_SYMBOL_GPL(crypto_has_ahash); 
static int ahash_prepare_alg(struct ahash_alg *alg)

{

	struct crypto_alg *base = &alg->halg.base;

	int err;



	if (alg->halg.digestsize > HASH_MAX_DIGESTSIZE ||

	    alg->halg.statesize > HASH_MAX_STATESIZE ||

	    alg->halg.statesize == 0)

	if (alg->halg.statesize == 0)

		return -EINVAL;



	err = hash_prepare_alg(&alg->halg);

	if (err)

		return err;



	base->cra_type = &crypto_ahash_type;

	base->cra_flags &= ~CRYPTO_ALG_TYPE_MASK;

	base->cra_flags |= CRYPTO_ALG_TYPE_AHASH;



	return 0;

crypto/algapi.c

+0 −24
Original line number Diff line number Diff line
@@ -1075,30 +1075,6 @@ void crypto_stats_decompress(unsigned int slen, int ret, struct crypto_alg *alg) 
}

EXPORT_SYMBOL_GPL(crypto_stats_decompress);



void crypto_stats_ahash_update(unsigned int nbytes, int ret,

			       struct crypto_alg *alg)

{

	if (ret && ret != -EINPROGRESS && ret != -EBUSY)

		atomic64_inc(&alg->stats.hash.err_cnt);

	else

		atomic64_add(nbytes, &alg->stats.hash.hash_tlen);

	crypto_alg_put(alg);

}

EXPORT_SYMBOL_GPL(crypto_stats_ahash_update);



void crypto_stats_ahash_final(unsigned int nbytes, int ret,

			      struct crypto_alg *alg)

{

	if (ret && ret != -EINPROGRESS && ret != -EBUSY) {

		atomic64_inc(&alg->stats.hash.err_cnt);

	} else {

		atomic64_inc(&alg->stats.hash.hash_cnt);

		atomic64_add(nbytes, &alg->stats.hash.hash_tlen);

	}

	crypto_alg_put(alg);

}

EXPORT_SYMBOL_GPL(crypto_stats_ahash_final);



void crypto_stats_kpp_set_secret(struct crypto_alg *alg, int ret)

{

	if (ret)

crypto/crypto_user_stat.c

+0 −38
Original line number Diff line number Diff line
@@ -92,36 +92,6 @@ static int crypto_report_kpp(struct sk_buff *skb, struct crypto_alg *alg) 
	return nla_put(skb, CRYPTOCFGA_STAT_KPP, sizeof(rkpp), &rkpp);

}



static int crypto_report_ahash(struct sk_buff *skb, struct crypto_alg *alg)

{

	struct crypto_stat_hash rhash;



	memset(&rhash, 0, sizeof(rhash));



	strscpy(rhash.type, "ahash", sizeof(rhash.type));



	rhash.stat_hash_cnt = atomic64_read(&alg->stats.hash.hash_cnt);

	rhash.stat_hash_tlen = atomic64_read(&alg->stats.hash.hash_tlen);

	rhash.stat_err_cnt = atomic64_read(&alg->stats.hash.err_cnt);



	return nla_put(skb, CRYPTOCFGA_STAT_HASH, sizeof(rhash), &rhash);

}



static int crypto_report_shash(struct sk_buff *skb, struct crypto_alg *alg)

{

	struct crypto_stat_hash rhash;



	memset(&rhash, 0, sizeof(rhash));



	strscpy(rhash.type, "shash", sizeof(rhash.type));



	rhash.stat_hash_cnt =  atomic64_read(&alg->stats.hash.hash_cnt);

	rhash.stat_hash_tlen = atomic64_read(&alg->stats.hash.hash_tlen);

	rhash.stat_err_cnt = atomic64_read(&alg->stats.hash.err_cnt);



	return nla_put(skb, CRYPTOCFGA_STAT_HASH, sizeof(rhash), &rhash);

}



static int crypto_report_rng(struct sk_buff *skb, struct crypto_alg *alg)

{

	struct crypto_stat_rng rrng;
@@ -198,14 +168,6 @@ static int crypto_reportstat_one(struct crypto_alg *alg, 
		if (crypto_report_kpp(skb, alg))

			goto nla_put_failure;

		break;

	case CRYPTO_ALG_TYPE_AHASH:

		if (crypto_report_ahash(skb, alg))

			goto nla_put_failure;

		break;

	case CRYPTO_ALG_TYPE_HASH:

		if (crypto_report_shash(skb, alg))

			goto nla_put_failure;

		break;

	case CRYPTO_ALG_TYPE_RNG:

		if (crypto_report_rng(skb, alg))

			goto nla_put_failure;

crypto/hash.h

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

/*

 * Cryptographic API.

 *

 * Copyright (c) 2023 Herbert Xu <herbert@gondor.apana.org.au>

 */

#ifndef _LOCAL_CRYPTO_HASH_H

#define _LOCAL_CRYPTO_HASH_H



#include <crypto/internal/hash.h>

#include <linux/cryptouser.h>



#include "internal.h"



static inline int crypto_hash_report_stat(struct sk_buff *skb,

					  struct crypto_alg *alg,

					  const char *type)

{

	struct hash_alg_common *halg = __crypto_hash_alg_common(alg);

	struct crypto_istat_hash *istat = hash_get_stat(halg);

	struct crypto_stat_hash rhash;



	memset(&rhash, 0, sizeof(rhash));



	strscpy(rhash.type, type, sizeof(rhash.type));



	rhash.stat_hash_cnt = atomic64_read(&istat->hash_cnt);

	rhash.stat_hash_tlen = atomic64_read(&istat->hash_tlen);

	rhash.stat_err_cnt = atomic64_read(&istat->err_cnt);



	return nla_put(skb, CRYPTOCFGA_STAT_HASH, sizeof(rhash), &rhash);

}



int hash_prepare_alg(struct hash_alg_common *alg);



#endif	/* _LOCAL_CRYPTO_HASH_H */

crypto/shash.c

+92 −22
Original line number Diff line number Diff line
@@ -6,22 +6,31 @@ 
 */



#include <crypto/scatterwalk.h>

#include <crypto/internal/hash.h>

#include <linux/cryptouser.h>

#include <linux/err.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/seq_file.h>

#include <linux/cryptouser.h>

#include <linux/string.h>

#include <net/netlink.h>

#include <linux/compiler.h>



#include "internal.h"

#include "hash.h"



#define MAX_SHASH_ALIGNMASK 63



static const struct crypto_type crypto_shash_type;



static inline struct crypto_istat_hash *shash_get_stat(struct shash_alg *alg)

{

	return hash_get_stat(&alg->halg);

}



static inline int crypto_shash_errstat(struct shash_alg *alg, int err)

{

	return crypto_hash_errstat(&alg->halg, err);

}



int shash_no_setkey(struct crypto_shash *tfm, const u8 *key,

		    unsigned int keylen)

{
@@ -114,11 +123,17 @@ int crypto_shash_update(struct shash_desc *desc, const u8 *data, 
	struct crypto_shash *tfm = desc->tfm;

	struct shash_alg *shash = crypto_shash_alg(tfm);

	unsigned long alignmask = crypto_shash_alignmask(tfm);

	int err;



	if (IS_ENABLED(CONFIG_CRYPTO_STATS))

		atomic64_add(len, &shash_get_stat(shash)->hash_tlen);



	if ((unsigned long)data & alignmask)

		return shash_update_unaligned(desc, data, len);

		err = shash_update_unaligned(desc, data, len);

	else

		err = shash->update(desc, data, len);



	return shash->update(desc, data, len);

	return crypto_shash_errstat(shash, err);

}

EXPORT_SYMBOL_GPL(crypto_shash_update);
@@ -155,19 +170,25 @@ int crypto_shash_final(struct shash_desc *desc, u8 *out) 
	struct crypto_shash *tfm = desc->tfm;

	struct shash_alg *shash = crypto_shash_alg(tfm);

	unsigned long alignmask = crypto_shash_alignmask(tfm);

	int err;



	if (IS_ENABLED(CONFIG_CRYPTO_STATS))

		atomic64_inc(&shash_get_stat(shash)->hash_cnt);



	if ((unsigned long)out & alignmask)

		return shash_final_unaligned(desc, out);

		err = shash_final_unaligned(desc, out);

	else

		err = shash->final(desc, out);



	return shash->final(desc, out);

	return crypto_shash_errstat(shash, err);

}

EXPORT_SYMBOL_GPL(crypto_shash_final);



static int shash_finup_unaligned(struct shash_desc *desc, const u8 *data,

				 unsigned int len, u8 *out)

{

	return crypto_shash_update(desc, data, len) ?:

	       crypto_shash_final(desc, out);

	return shash_update_unaligned(desc, data, len) ?:

	       shash_final_unaligned(desc, out);

}



int crypto_shash_finup(struct shash_desc *desc, const u8 *data,
@@ -176,11 +197,22 @@ int crypto_shash_finup(struct shash_desc *desc, const u8 *data, 
	struct crypto_shash *tfm = desc->tfm;

	struct shash_alg *shash = crypto_shash_alg(tfm);

	unsigned long alignmask = crypto_shash_alignmask(tfm);

	int err;



	if (IS_ENABLED(CONFIG_CRYPTO_STATS)) {

		struct crypto_istat_hash *istat = shash_get_stat(shash);



		atomic64_inc(&istat->hash_cnt);

		atomic64_add(len, &istat->hash_tlen);

	}



	if (((unsigned long)data | (unsigned long)out) & alignmask)

		return shash_finup_unaligned(desc, data, len, out);

		err = shash_finup_unaligned(desc, data, len, out);

	else

		err = shash->finup(desc, data, len, out);





	return shash->finup(desc, data, len, out);

	return crypto_shash_errstat(shash, err);

}

EXPORT_SYMBOL_GPL(crypto_shash_finup);
@@ -188,7 +220,8 @@ static int shash_digest_unaligned(struct shash_desc *desc, const u8 *data, 
				  unsigned int len, u8 *out)

{

	return crypto_shash_init(desc) ?:

	       crypto_shash_finup(desc, data, len, out);

	       shash_update_unaligned(desc, data, len) ?:

	       shash_final_unaligned(desc, out);

}



int crypto_shash_digest(struct shash_desc *desc, const u8 *data,
@@ -197,14 +230,23 @@ int crypto_shash_digest(struct shash_desc *desc, const u8 *data, 
	struct crypto_shash *tfm = desc->tfm;

	struct shash_alg *shash = crypto_shash_alg(tfm);

	unsigned long alignmask = crypto_shash_alignmask(tfm);

	int err;



	if (crypto_shash_get_flags(tfm) & CRYPTO_TFM_NEED_KEY)

		return -ENOKEY;

	if (IS_ENABLED(CONFIG_CRYPTO_STATS)) {

		struct crypto_istat_hash *istat = shash_get_stat(shash);



	if (((unsigned long)data | (unsigned long)out) & alignmask)

		return shash_digest_unaligned(desc, data, len, out);

		atomic64_inc(&istat->hash_cnt);

		atomic64_add(len, &istat->hash_tlen);

	}



	return shash->digest(desc, data, len, out);

	if (crypto_shash_get_flags(tfm) & CRYPTO_TFM_NEED_KEY)

		err = -ENOKEY;

	else if (((unsigned long)data | (unsigned long)out) & alignmask)

		err = shash_digest_unaligned(desc, data, len, out);

	else

		err = shash->digest(desc, data, len, out);



	return crypto_shash_errstat(shash, err);

}

EXPORT_SYMBOL_GPL(crypto_shash_digest);
@@ -481,6 +523,12 @@ static void crypto_shash_show(struct seq_file *m, struct crypto_alg *alg) 
	seq_printf(m, "digestsize   : %u\n", salg->digestsize);

}



static int __maybe_unused crypto_shash_report_stat(

	struct sk_buff *skb, struct crypto_alg *alg)

{

	return crypto_hash_report_stat(skb, alg, "shash");

}



static const struct crypto_type crypto_shash_type = {

	.extsize = crypto_alg_extsize,

	.init_tfm = crypto_shash_init_tfm,
@@ -489,6 +537,9 @@ static const struct crypto_type crypto_shash_type = { 
	.show = crypto_shash_show,

#endif

	.report = crypto_shash_report,

#ifdef CONFIG_CRYPTO_STATS

	.report_stat = crypto_shash_report_stat,

#endif

	.maskclear = ~CRYPTO_ALG_TYPE_MASK,

	.maskset = CRYPTO_ALG_TYPE_MASK,

	.type = CRYPTO_ALG_TYPE_SHASH,
@@ -517,23 +568,42 @@ int crypto_has_shash(const char *alg_name, u32 type, u32 mask) 
}

EXPORT_SYMBOL_GPL(crypto_has_shash);



static int shash_prepare_alg(struct shash_alg *alg)

int hash_prepare_alg(struct hash_alg_common *alg)

{

	struct crypto_istat_hash *istat = hash_get_stat(alg);

	struct crypto_alg *base = &alg->base;



	if (alg->digestsize > HASH_MAX_DIGESTSIZE ||

	    alg->descsize > HASH_MAX_DESCSIZE ||

	    alg->statesize > HASH_MAX_STATESIZE)

		return -EINVAL;



	base->cra_flags &= ~CRYPTO_ALG_TYPE_MASK;



	if (IS_ENABLED(CONFIG_CRYPTO_STATS))

		memset(istat, 0, sizeof(*istat));



	return 0;

}



static int shash_prepare_alg(struct shash_alg *alg)

{

	struct crypto_alg *base = &alg->halg.base;

	int err;



	if (alg->descsize > HASH_MAX_DESCSIZE)

		return -EINVAL;



	if (base->cra_alignmask > MAX_SHASH_ALIGNMASK)

		return -EINVAL;



	if ((alg->export && !alg->import) || (alg->import && !alg->export))

		return -EINVAL;



	err = hash_prepare_alg(&alg->halg);

	if (err)

		return err;



	base->cra_type = &crypto_shash_type;

	base->cra_flags &= ~CRYPTO_ALG_TYPE_MASK;

	base->cra_flags |= CRYPTO_ALG_TYPE_SHASH;



	if (!alg->finup)
@@ -543,7 +613,7 @@ static int shash_prepare_alg(struct shash_alg *alg) 
	if (!alg->export) {

		alg->export = shash_default_export;

		alg->import = shash_default_import;

		alg->statesize = alg->descsize;

		alg->halg.statesize = alg->descsize;

	}

	if (!alg->setkey)

		alg->setkey = shash_no_setkey;