f2fs crypto: replace some BUG_ON()'s with error checks
Subsystems (2)
Jaegeuk Kim
maintainerPATCH 1/5 f2fs crypto: replace some BUG_ON()'s with error checks
This patch adopts:
ext4 crypto: replace some BUG_ON()'s with error checks
--- fs/f2fs/crypto.c | 1 - fs/f2fs/crypto_fname.c | 2 -- fs/f2fs/crypto_key.c | 15 ++++++++++++--- 3 files changed, 12 insertions(+), 6 deletions(-)
fs/f2fs/crypto.c +0 -1
@@ -362,7 +362,6 @@ static int f2fs_page_crypto(struct f2fs_crypto_ctx *ctx,else res =crypto_ablkcipher_encrypt (req);if (res == -EINPROGRESS || res == -EBUSY ) { -BUG_ON (req->base.data != &ecr);wait_for_completion (&ecr.completion); res = ecr.res; }
fs/f2fs/crypto_fname.c +0 -2
@@ -124,7 +124,6 @@ static int f2fs_fname_encrypt(struct inode *inode,ablkcipher_request_set_crypt (req, &src_sg, &dst_sg, ciphertext_len, iv); res =crypto_ablkcipher_encrypt (req);if (res == -EINPROGRESS || res == -EBUSY ) { -BUG_ON (req->base.data != &ecr);wait_for_completion (&ecr.completion); res = ecr.res; }
@@ -180,7 +179,6 @@ static int f2fs_fname_decrypt(struct inode *inode,ablkcipher_request_set_crypt (req, &src_sg, &dst_sg, iname->len, iv); res =crypto_ablkcipher_decrypt (req);if (res == -EINPROGRESS || res == -EBUSY ) { -BUG_ON (req->base.data != &ecr);wait_for_completion (&ecr.completion); res = ecr.res; }
fs/f2fs/crypto_key.c +12 -3
@@ -75,7 +75,6 @@ static int f2fs_derive_key_aes(char deriving_key[F2FS_AES_128_ECB_KEY_SIZE], F2FS_AES_256_XTS_KEY_SIZE, NULL); res =crypto_ablkcipher_encrypt (req);if (res == -EINPROGRESS || res == -EBUSY ) { -BUG_ON (req->base.data != &ecr);wait_for_completion (&ecr.completion); res = ecr.res; }
@@ -198,7 +197,11 @@ retry: goto out; } crypt_info->ci_keyring_key = keyring_key; -BUG_ON (keyring_key->type != &key_type_logon); +if (keyring_key->type != &key_type_logon) { +printk_once (KERN_WARNING "f2fs: key type must be logon\n" ); + res = -ENOKEY ; + goto out; + } ukp =user_key_payload (keyring_key);if (ukp->datalen !=sizeof (struct f2fs_encryption_key )) { res = -EINVAL ;
@@ -207,7 +210,13 @@ retry: master_key = (struct f2fs_encryption_key *)ukp->data;BUILD_BUG_ON (F2FS_AES_128_ECB_KEY_SIZE !=F2FS_KEY_DERIVATION_NONCE_SIZE ); -BUG_ON (master_key->size !=F2FS_AES_256_XTS_KEY_SIZE ); +if (master_key->size !=F2FS_AES_256_XTS_KEY_SIZE ) { +printk_once (KERN_WARNING +"f2fs: key size incorrect: %d\n" , + master_key->size); + res = -ENOKEY ; + goto out; + } res =f2fs_derive_key_aes (ctx.nonce, master_key->raw, raw_key);if (res)
Signature · 1 line
2.6.3
Jaegeuk Kim
maintainerPATCH 2/5 f2fs crypto: fix spelling typo in comment
This patch adopts:
ext4 crypto: fix spelling typo in comment
--- fs/f2fs/crypto_key.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/crypto_key.c +1 -1
@@ -33,7 +33,7 @@ static void derive_crypt_complete(struct crypto_async_request *req, int rc)/** * f2fs_derive_key_aes() - Derive a key using AES-128-ECB -* @deriving_key: Encryption key used for derivatio. +* @deriving_key: Encryption key used for derivation. * @source_key: Source key to which to apply derivation. * @derived_key: Derived key. *
Signature · 1 line
2.6.3
Jaegeuk Kim
maintainerPATCH 3/5 f2fs crypto: f2fs_page_crypto() doesn't need a encryption context
In reply to Jaegeuk KimThis patch adopts:
ext4 crypto: ext4_page_crypto() doesn't need a encryption context
Since ext4_page_crypto() doesn't need an encryption context (at least not any more), this allows us to simplify a number function signature and also allows us to avoid needing to allocate a context in ext4_block_write_begin(). It also means we no longer need a separate ext4_decrypt_one() function.
--- fs/f2fs/crypto.c | 27 +++++---------------------- fs/f2fs/data.c | 2 +- fs/f2fs/f2fs.h | 3 +-- 3 files changed, 7 insertions(+), 25 deletions(-)
fs/f2fs/crypto.c +5 -22
@@ -156,7 +156,7 @@ static void completion_pages(struct work_struct *work)bio_for_each_segment_all (bv, bio, i) {struct page *page = bv->bv_page; -int ret =f2fs_decrypt (ctx, page); +int ret =f2fs_decrypt (page);if (ret) {WARN_ON_ONCE (1 );
@@ -320,8 +320,7 @@ typedef enum {F2FS_ENCRYPT , } f2fs_direction_t; -static int f2fs_page_crypto(struct f2fs_crypto_ctx *ctx, - struct inode *inode, +static int f2fs_page_crypto(struct inode *inode, f2fs_direction_t rw, pgoff_t index, struct page *src_page,
@@ -418,7 +417,7 @@ struct page *f2fs_encrypt(struct inode *inode, goto err_out; ctx->w.control_page = plaintext_page; - err =f2fs_page_crypto (ctx, inode,F2FS_ENCRYPT , plaintext_page->index, + err =f2fs_page_crypto (inode,F2FS_ENCRYPT , plaintext_page->index, plaintext_page, ciphertext_page);if (err) { ciphertext_page =ERR_PTR (err);
@@ -446,30 +445,14 @@ err_out:* * Return: Zero on success, non-zero otherwise. */ -int f2fs_decrypt (struct f2fs_crypto_ctx *ctx,struct page *page) +int f2fs_decrypt (struct page *page) {BUG_ON (!PageLocked (page)); -return f2fs_page_crypto (ctx, page->mapping->host, +return f2fs_page_crypto (page->mapping->host,F2FS_DECRYPT , page->index, page, page); } -/* -* Convenience function which takes care of allocating and -* deallocating the encryption context -*/ -int f2fs_decrypt_one (struct inode *inode,struct page *page) -{ -struct f2fs_crypto_ctx *ctx =f2fs_get_crypto_ctx (inode); -int ret; - -if (IS_ERR (ctx)) -return PTR_ERR (ctx); - ret =f2fs_decrypt (ctx, page); -f2fs_release_crypto_ctx (ctx); -return ret; -} -bool f2fs_valid_contents_enc_mode (uint32_t mode) {return (mode ==F2FS_ENCRYPTION_MODE_AES_256_XTS );
fs/f2fs/data.c +1 -1
@@ -1592,7 +1592,7 @@ repeat:/* avoid symlink page */ if (f2fs_encrypted_inode (inode) &&S_ISREG (inode->i_mode)) { - err =f2fs_decrypt_one (inode, page); + err =f2fs_decrypt (page);if (err) goto fail; }
fs/f2fs/f2fs.h +1 -2
@@ -2213,8 +2213,7 @@ uint32_t f2fs_validate_encryption_key_size(uint32_t, uint32_t);struct f2fs_crypto_ctx *f2fs_get_crypto_ctx (struct inode *);void f2fs_release_crypto_ctx (struct f2fs_crypto_ctx *);struct page *f2fs_encrypt (struct inode *,struct page *); -int f2fs_decrypt (struct f2fs_crypto_ctx *,struct page *); -int f2fs_decrypt_one (struct inode *,struct page *); +int f2fs_decrypt (struct page *);void f2fs_end_io_crypto_work (struct f2fs_crypto_ctx *,struct bio *);/* crypto_key.c */
Signature · 1 line
2.6.3
Jaegeuk Kim
maintainerPATCH 4/5 f2fs crypto: check for too-short encrypted file names
In reply to Jaegeuk KimThis patch adopts:
ext4 crypto: check for too-short encrypted file names
An encrypted file name should never be shorter than an 16 bytes, the AES block size. The 3.10 crypto layer will oops and crash the kernel if ciphertext shorter than the block size is passed to it.
Fortunately, in modern kernels the crypto layer will not crash the kernel in this scenario, but nevertheless, it represents a corrupted directory, and we should detect it and mark the file system as corrupted so that e2fsck can fix this.
--- fs/f2fs/crypto_fname.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/f2fs/crypto_fname.c +4 -1
@@ -317,7 +317,10 @@ int f2fs_fname_disk_to_usr(struct inode *inode, oname->len = iname->len;return oname->len; } - +if (iname->len <F2FS_CRYPTO_BLOCK_SIZE ) { +printk ("encrypted inode too small" ); +return -EUCLEAN ; + }if (F2FS_I (inode)->i_crypt_info)return f2fs_fname_decrypt (inode, iname, oname);
Signature · 1 line
2.6.3
Jaegeuk Kim
maintainerPATCH 5/5 f2fs crypto: add missing locking for keyring_key access
In reply to Jaegeuk KimThis patch adopts:
ext4 crypto: add missing locking for keyring_key access
--- fs/f2fs/crypto_key.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/f2fs/crypto_key.c +4 -0
@@ -202,9 +202,11 @@ retry: res = -ENOKEY ; goto out; } +down_read (&keyring_key->sem); ukp =user_key_payload (keyring_key);if (ukp->datalen !=sizeof (struct f2fs_encryption_key )) { res = -EINVAL ; +up_read (&keyring_key->sem); goto out; } master_key = (struct f2fs_encryption_key *)ukp->data;
@@ -215,10 +217,12 @@ retry:"f2fs: key size incorrect: %d\n" , master_key->size); res = -ENOKEY ; +up_read (&keyring_key->sem); goto out; } res =f2fs_derive_key_aes (ctx.nonce, master_key->raw, raw_key); +up_read (&keyring_key->sem);if (res) goto out;
Signature · 1 line
2.6.3