Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f337455 authored by Eric Biggers's avatar Eric Biggers Committed by Jaegeuk Kim
Browse files

fscrypt: remove error messages for skcipher_request_alloc() failure 



skcipher_request_alloc() can only fail due to lack of memory, and in
that case the memory allocator will have already printed a detailed
error message.  Thus, remove the redundant error messages from fscrypt.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 347264d8

fs/crypto/crypto.c

+1 −5
Original line number Diff line number Diff line
@@ -162,12 +162,8 @@ int fscrypt_do_page_crypto(const struct inode *inode, fscrypt_direction_t rw, 
	}



	req = ablkcipher_request_alloc(tfm, gfp_flags);

	if (!req) {

		printk_ratelimited(KERN_ERR

				"%s: crypto_request_alloc() failed\n",

				__func__);

	if (!req)

		return -ENOMEM;

	}



	ablkcipher_request_set_callback(

		req, CRYPTO_TFM_REQ_MAY_BACKLOG | CRYPTO_TFM_REQ_MAY_SLEEP,

fs/crypto/fname.c

+2 −8
Original line number Diff line number Diff line
@@ -58,11 +58,8 @@ int fname_encrypt(struct inode *inode, const struct qstr *iname, 


	/* Set up the encryption request */

	req = ablkcipher_request_alloc(tfm, GFP_NOFS);

	if (!req) {

		printk_ratelimited(KERN_ERR

			"%s: ablkcipher_request_alloc() failed\n", __func__);

	if (!req)

		return -ENOMEM;

	}

	ablkcipher_request_set_callback(req,

			CRYPTO_TFM_REQ_MAY_BACKLOG | CRYPTO_TFM_REQ_MAY_SLEEP,

			crypto_req_done, &wait);
@@ -107,11 +104,8 @@ static int fname_decrypt(struct inode *inode, 


	/* Allocate request */

	req = ablkcipher_request_alloc(tfm, GFP_NOFS);

	if (!req) {

		printk_ratelimited(KERN_ERR

			"%s: crypto_request_alloc() failed\n",  __func__);

	if (!req)

		return -ENOMEM;

	}

	ablkcipher_request_set_callback(req,

		CRYPTO_TFM_REQ_MAY_BACKLOG | CRYPTO_TFM_REQ_MAY_SLEEP,

		crypto_req_done, &wait);