Commit 41b2ad80 authored by Eric Biggers's avatar Eric Biggers
Browse files

fscrypt: use WARN_ON_ONCE instead of WARN_ON 

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.

Link: https://lore.kernel.org/r/20230320233943.73600-1-ebiggers@kernel.org


Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent 6f2656ea

fs/crypto/bio.c

+3 −3
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static int fscrypt_zeroout_range_inline_crypt(const struct inode *inode, 
					pblk << (blockbits - SECTOR_SHIFT);

		}

		ret = bio_add_page(bio, ZERO_PAGE(0), bytes_this_page, 0);

		if (WARN_ON(ret != bytes_this_page)) {

		if (WARN_ON_ONCE(ret != bytes_this_page)) {

			err = -EIO;

			goto out;

		}
@@ -147,7 +147,7 @@ int fscrypt_zeroout_range(const struct inode *inode, pgoff_t lblk, 
			break;

	}

	nr_pages = i;

	if (WARN_ON(nr_pages <= 0))

	if (WARN_ON_ONCE(nr_pages <= 0))

		return -EINVAL;



	/* This always succeeds since __GFP_DIRECT_RECLAIM is set. */
@@ -170,7 +170,7 @@ int fscrypt_zeroout_range(const struct inode *inode, pgoff_t lblk, 
			offset += blocksize;

			if (offset == PAGE_SIZE || len == 0) {

				ret = bio_add_page(bio, pages[i++], offset, 0);

				if (WARN_ON(ret != offset)) {

				if (WARN_ON_ONCE(ret != offset)) {

					err = -EIO;

					goto out;

				}

fs/crypto/fname.c

+2 −2
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ int fscrypt_fname_encrypt(const struct inode *inode, const struct qstr *iname, 
	 * Copy the filename to the output buffer for encrypting in-place and

	 * pad it with the needed number of NUL bytes.

	 */

	if (WARN_ON(olen < iname->len))

	if (WARN_ON_ONCE(olen < iname->len))

		return -ENOBUFS;

	memcpy(out, iname->name, iname->len);

	memset(out + iname->len, 0, olen - iname->len);
@@ -570,7 +570,7 @@ u64 fscrypt_fname_siphash(const struct inode *dir, const struct qstr *name) 
{

	const struct fscrypt_info *ci = dir->i_crypt_info;



	WARN_ON(!ci->ci_dirhash_key_initialized);

	WARN_ON_ONCE(!ci->ci_dirhash_key_initialized);



	return siphash(name->name, name->len, &ci->ci_dirhash_key);

}

fs/crypto/fscrypt_private.h

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static inline const u8 *fscrypt_context_nonce(const union fscrypt_context *ctx) 
	case FSCRYPT_CONTEXT_V2:

		return ctx->v2.nonce;

	}

	WARN_ON(1);

	WARN_ON_ONCE(1);

	return NULL;

}
@@ -386,7 +386,7 @@ fscrypt_prepare_inline_crypt_key(struct fscrypt_prepared_key *prep_key, 
				 const u8 *raw_key,

				 const struct fscrypt_info *ci)

{

	WARN_ON(1);

	WARN_ON_ONCE(1);

	return -EOPNOTSUPP;

}

fs/crypto/hkdf.c

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ int fscrypt_init_hkdf(struct fscrypt_hkdf *hkdf, const u8 *master_key, 
		return PTR_ERR(hmac_tfm);

	}



	if (WARN_ON(crypto_shash_digestsize(hmac_tfm) != sizeof(prk))) {

	if (WARN_ON_ONCE(crypto_shash_digestsize(hmac_tfm) != sizeof(prk))) {

		err = -EINVAL;

		goto err_free_tfm;

	}
@@ -125,7 +125,7 @@ int fscrypt_hkdf_expand(const struct fscrypt_hkdf *hkdf, u8 context, 
	u8 counter = 1;

	u8 tmp[HKDF_HASHLEN];



	if (WARN_ON(okmlen > 255 * HKDF_HASHLEN))

	if (WARN_ON_ONCE(okmlen > 255 * HKDF_HASHLEN))

		return -EINVAL;



	desc->tfm = hkdf->hmac_tfm;

fs/crypto/hooks.c

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ const char *fscrypt_get_symlink(struct inode *inode, const void *caddr, 
	int err;



	/* This is for encrypted symlinks only */

	if (WARN_ON(!IS_ENCRYPTED(inode)))

	if (WARN_ON_ONCE(!IS_ENCRYPTED(inode)))

		return ERR_PTR(-EINVAL);



	/* If the decrypted target is already cached, just return it. */