fsverity: use WARN_ON_ONCE instead of WARN_ON
Subsystems (2)
Eric Biggers
maintainerPATCH 1/1 fsverity: use WARN_ON_ONCE instead of WARN_ON
From: Eric Biggers <[email protected]>
As per Linus's suggestion
(https://lore.kernel.org/r/CAHk-=whefxRGyNGzCzG6BVeM=5vnvgb-XhSeFJVxJyAxAF8XRA@mail.gmail.com),
use WARN_ON_ONCE instead of WARN_ON. This barely adds any extra overhead, and it makes it so that if any of these ever becomes reachable (they shouldn't, but that's the point), the logs can't be flooded.
--- fs/verity/enable.c | 4 ++-- fs/verity/hash_algs.c | 4 ++-- fs/verity/open.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
fs/verity/enable.c +2 -2
@@ -165,7 +165,7 @@ static int build_merkle_tree(struct file *filp, } }/* The root hash was filled by the last call to hash_one_block(). */ -if (WARN_ON (buffers[num_levels].filled != params->digest_size)) { +if (WARN_ON_ONCE (buffers[num_levels].filled != params->digest_size)) { err = -EINVAL ; goto out; }
@@ -277,7 +277,7 @@ static int enable_verity(struct file *filp,fsverity_err (inode,"%ps() failed with err %d" , vops->end_enable_verity, err);fsverity_free_info (vi); - }else if (WARN_ON (!IS_VERITY (inode))) { + }else if (WARN_ON_ONCE (!IS_VERITY (inode))) { err = -EINVAL ;fsverity_free_info (vi); }else {
fs/verity/hash_algs.c +2 -2
@@ -84,9 +84,9 @@ struct fsverity_hash_alg *fsverity_get_hash_alg(const struct inode *inode, } err = -EINVAL ; -if (WARN_ON (alg->digest_size !=crypto_ahash_digestsize (tfm))) +if (WARN_ON_ONCE (alg->digest_size !=crypto_ahash_digestsize (tfm))) goto err_free_tfm; -if (WARN_ON (alg->block_size !=crypto_ahash_blocksize (tfm))) +if (WARN_ON_ONCE (alg->block_size !=crypto_ahash_blocksize (tfm))) goto err_free_tfm; err = mempool_init_kmalloc_pool(&alg->req_pool, 1,
fs/verity/open.c +1 -1
@@ -83,7 +83,7 @@ int fsverity_init_merkle_tree_params(struct merkle_tree_params *params, params->log_blocks_per_page =PAGE_SHIFT - log_blocksize; params->blocks_per_page =1 << params->log_blocks_per_page; -if (WARN_ON (!is_power_of_2 (params->digest_size))) { +if (WARN_ON_ONCE (!is_power_of_2 (params->digest_size))) { err = -EINVAL ; goto out_err; }
base-commit: 2da81b8479434c62a9ae189ec24729445f74b6a9
Signature · 1 line
2.40.0
Quoted 11 lines · Eric Biggers
From: Eric Biggers <[email protected]>
As per Linus's suggestion
(https://lore.kernel.org/r/CAHk-=whefxRGyNGzCzG6BVeM=5vnvgb-XhSeFJVxJyAxAF8XRA@mail.gmail.com),
useWARN_ON_ONCEinstead ofWARN_ON. This barely adds any extra overhead, and it makes it so that if any of these ever becomes reachable (they shouldn't, but that's the point), the logs can't be flooded.Signed-off-by Eric Biggers <[email protected]>---
Looks good.
-ck