Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1503345 > unrolled thread
| Started by | Richard Weinberger <richard@nod.at> |
|---|---|
| First post | 2016-10-18 23:00 +0200 |
| Last post | 2016-10-21 22:10 +0200 |
| Articles | 5 — 2 participants |
Back to article view | Back to linux.kernel
fscrypto: Two trivial patches Richard Weinberger <richard@nod.at> - 2016-10-18 23:00 +0200
[PATCH 2/2] fscrypto: Fix fscrypt_decrypt_page() doc string Richard Weinberger <richard@nod.at> - 2016-10-18 23:00 +0200
Re: [PATCH 2/2] fscrypto: Fix fscrypt_decrypt_page() doc string Eric Biggers <ebiggers@google.com> - 2016-10-21 22:10 +0200
[PATCH 1/2] fscrypto: Fix log string in do_crypto() Richard Weinberger <richard@nod.at> - 2016-10-18 23:00 +0200
Re: [PATCH 1/2] fscrypto: Fix log string in do_crypto() Eric Biggers <ebiggers@google.com> - 2016-10-21 22:10 +0200
| From | Richard Weinberger <richard@nod.at> |
|---|---|
| Date | 2016-10-18 23:00 +0200 |
| Subject | fscrypto: Two trivial patches |
| Message-ID | <stJEm-79N-15@gated-at.bofh.it> |
Thanks, //richard [PATCH 1/2] fscrypto: Fix log string in do_crypto() [PATCH 2/2] fscrypto: Fix fscrypt_decrypt_page() doc string
[toc] | [next] | [standalone]
| From | Richard Weinberger <richard@nod.at> |
|---|---|
| Date | 2016-10-18 23:00 +0200 |
| Subject | [PATCH 2/2] fscrypto: Fix fscrypt_decrypt_page() doc string |
| Message-ID | <stJEm-79N-29@gated-at.bofh.it> |
| In reply to | #1503345 |
Most likely a copy&paste error from the f2fs import. Signed-off-by: Richard Weinberger <richard@nod.at> --- 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
[toc] | [prev] | [next] | [standalone]
| From | Eric Biggers <ebiggers@google.com> |
|---|---|
| Date | 2016-10-21 22:10 +0200 |
| Subject | Re: [PATCH 2/2] fscrypto: Fix fscrypt_decrypt_page() doc string |
| Message-ID | <suOiC-20g-17@gated-at.bofh.it> |
| In reply to | #1503347 |
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 <richard@nod.at> > --- > 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 <ebiggers@google.com>
[toc] | [prev] | [next] | [standalone]
| From | Richard Weinberger <richard@nod.at> |
|---|---|
| Date | 2016-10-18 23:00 +0200 |
| Subject | [PATCH 1/2] fscrypto: Fix log string in do_crypto() |
| Message-ID | <stJEm-79N-13@gated-at.bofh.it> |
| In reply to | #1503345 |
The operations supports both encryption and decryption.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
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
[toc] | [prev] | [next] | [standalone]
| From | Eric Biggers <ebiggers@google.com> |
|---|---|
| Date | 2016-10-21 22:10 +0200 |
| Subject | Re: [PATCH 1/2] fscrypto: Fix log string in do_crypto() |
| Message-ID | <suOiC-20g-27@gated-at.bofh.it> |
| In reply to | #1503348 |
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 <richard@nod.at>
> ---
> 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 <ebiggers@google.com>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web