* fscrypto: Two trivial patches @ 2016-10-18 20:54 Richard Weinberger 2016-10-18 20:54 ` [PATCH 1/2] fscrypto: Fix log string in do_crypto() Richard Weinberger 2016-10-18 20:54 ` [PATCH 2/2] fscrypto: Fix fscrypt_decrypt_page() doc string Richard Weinberger 0 siblings, 2 replies; 5+ messages in thread From: Richard Weinberger @ 2016-10-18 20:54 UTC (permalink / raw) To: linux-kernel; +Cc: linux-fsdevel, ebiggers, jaegeuk, tytso Thanks, //richard [PATCH 1/2] fscrypto: Fix log string in do_crypto() [PATCH 2/2] fscrypto: Fix fscrypt_decrypt_page() doc string ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] fscrypto: Fix log string in do_crypto() 2016-10-18 20:54 fscrypto: Two trivial patches Richard Weinberger @ 2016-10-18 20:54 ` Richard Weinberger 2016-10-21 20:02 ` Eric Biggers 2016-10-18 20:54 ` [PATCH 2/2] fscrypto: Fix fscrypt_decrypt_page() doc string Richard Weinberger 1 sibling, 1 reply; 5+ messages in thread From: Richard Weinberger @ 2016-10-18 20:54 UTC (permalink / raw) To: linux-kernel; +Cc: linux-fsdevel, ebiggers, jaegeuk, tytso, Richard Weinberger 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 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] fscrypto: Fix log string in do_crypto() 2016-10-18 20:54 ` [PATCH 1/2] fscrypto: Fix log string in do_crypto() Richard Weinberger @ 2016-10-21 20:02 ` Eric Biggers 0 siblings, 0 replies; 5+ messages in thread From: Eric Biggers @ 2016-10-21 20:02 UTC (permalink / raw) To: Richard Weinberger; +Cc: linux-kernel, linux-fsdevel, jaegeuk, tytso 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> ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] fscrypto: Fix fscrypt_decrypt_page() doc string 2016-10-18 20:54 fscrypto: Two trivial patches Richard Weinberger 2016-10-18 20:54 ` [PATCH 1/2] fscrypto: Fix log string in do_crypto() Richard Weinberger @ 2016-10-18 20:54 ` Richard Weinberger 2016-10-21 20:02 ` Eric Biggers 1 sibling, 1 reply; 5+ messages in thread From: Richard Weinberger @ 2016-10-18 20:54 UTC (permalink / raw) To: linux-kernel; +Cc: linux-fsdevel, ebiggers, jaegeuk, tytso, Richard Weinberger 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 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] fscrypto: Fix fscrypt_decrypt_page() doc string 2016-10-18 20:54 ` [PATCH 2/2] fscrypto: Fix fscrypt_decrypt_page() doc string Richard Weinberger @ 2016-10-21 20:02 ` Eric Biggers 0 siblings, 0 replies; 5+ messages in thread From: Eric Biggers @ 2016-10-21 20:02 UTC (permalink / raw) To: Richard Weinberger; +Cc: linux-kernel, linux-fsdevel, jaegeuk, tytso 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> ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-10-21 20:02 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-10-18 20:54 fscrypto: Two trivial patches Richard Weinberger 2016-10-18 20:54 ` [PATCH 1/2] fscrypto: Fix log string in do_crypto() Richard Weinberger 2016-10-21 20:02 ` Eric Biggers 2016-10-18 20:54 ` [PATCH 2/2] fscrypto: Fix fscrypt_decrypt_page() doc string Richard Weinberger 2016-10-21 20:02 ` Eric Biggers
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).