2016-10-18 20:55:07

by Richard Weinberger

Subject: fscrypto: Two trivial patches

Thanks,
//richard

[PATCH 1/2] fscrypto: Fix log string in do_crypto()
[PATCH 2/2] fscrypto: Fix fscrypt_decrypt_page() doc string

2016-10-18 20:55:17

by Richard Weinberger

Subject: [PATCH 2/2] fscrypto: Fix fscrypt_decrypt_page() doc string

Most likely a copy&paste error from the f2fs import.

Signed-off-by: Richard Weinberger <[email protected]>
---
fs/crypto/crypto.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c
index 1637a0450b9f..d789ddbc0a46 100644
--- a/fs/crypto/crypto.c
+++ b/fs/crypto/crypto.c
@@ -265,7 +265,7 @@ struct page *fscrypt_encrypt_page(struct inode *inode,
EXPORT_SYMBOL(fscrypt_encrypt_page);

/**
- * f2crypt_decrypt_page() - Decrypts a page in-place
+ * fscrypt_decrypt_page() - Decrypts a page in-place
* @page: The page to decrypt. Must be locked.
*
* Decrypts page in-place using the ctx encryption context.
--
2.7.3

2016-10-18 20:55:15

by Richard Weinberger

Subject: [PATCH 1/2] fscrypto: Fix log string in do_crypto()

The operations supports both encryption and decryption.

Signed-off-by: Richard Weinberger <[email protected]>
---
fs/crypto/crypto.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c
index 61057b7dbddb..1637a0450b9f 100644
--- a/fs/crypto/crypto.c
+++ b/fs/crypto/crypto.c
@@ -194,8 +194,9 @@ static int do_page_crypto(struct inode *inode,
skcipher_request_free(req);
if (res) {
printk_ratelimited(KERN_ERR
- "%s: crypto_skcipher_encrypt() returned %d\n",
- __func__, res);
+ "%s: crypto_skcipher_%scrypt() returned %d, flags %#x\n",
+ __func__, rw == FS_DECRYPT ? "de" : "en", res,
+ crypto_skcipher_get_flags(tfm));
return res;
}
return 0;
--
2.7.3

2016-10-21 20:02:06

by Eric Biggers

Subject: Re: [PATCH 1/2] fscrypto: Fix log string in do_crypto()

On Tue, Oct 18, 2016 at 10:54:48PM +0200, Richard Weinberger wrote:
> The operations supports both encryption and decryption.
>
> Signed-off-by: Richard Weinberger <[email protected]>
> ---
> fs/crypto/crypto.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c
> index 61057b7dbddb..1637a0450b9f 100644
> --- a/fs/crypto/crypto.c
> +++ b/fs/crypto/crypto.c
> @@ -194,8 +194,9 @@ static int do_page_crypto(struct inode *inode,
> skcipher_request_free(req);
> if (res) {
> printk_ratelimited(KERN_ERR
> - "%s: crypto_skcipher_encrypt() returned %d\n",
> - __func__, res);
> + "%s: crypto_skcipher_%scrypt() returned %d, flags %#x\n",
> + __func__, rw == FS_DECRYPT ? "de" : "en", res,
> + crypto_skcipher_get_flags(tfm));
> return res;
> }
> return 0;
> --
> 2.7.3
>

Looks fine.

Reviewed-by: Eric Biggers <[email protected]>

2016-10-21 20:02:57

by Eric Biggers

Subject: Re: [PATCH 2/2] fscrypto: Fix fscrypt_decrypt_page() doc string

On Tue, Oct 18, 2016 at 10:54:49PM +0200, Richard Weinberger wrote:
> Most likely a copy&paste error from the f2fs import.
>
> Signed-off-by: Richard Weinberger <[email protected]>
> ---
> fs/crypto/crypto.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c
> index 1637a0450b9f..d789ddbc0a46 100644
> --- a/fs/crypto/crypto.c
> +++ b/fs/crypto/crypto.c
> @@ -265,7 +265,7 @@ struct page *fscrypt_encrypt_page(struct inode *inode,
> EXPORT_SYMBOL(fscrypt_encrypt_page);
>
> /**
> - * f2crypt_decrypt_page() - Decrypts a page in-place
> + * fscrypt_decrypt_page() - Decrypts a page in-place
> * @page: The page to decrypt. Must be locked.
> *
> * Decrypts page in-place using the ctx encryption context.
> --
> 2.7.3
>

Looks fine.

Reviewed-by: Eric Biggers <[email protected]>