From: Kees Cook <keescook@chromium.org>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Kees Cook <keescook@chromium.org>,
Geliang Tang <geliangtang@gmail.com>,
Arnd Bergmann <arnd@arndb.de>, Haren Myneni <haren@us.ibm.com>,
Anton Vorontsov <anton@enomsg.org>,
Colin Cross <ccross@android.com>, Tony Luck <tony.luck@intel.com>,
Zhou Wang <wangzhou1@hisilicon.com>,
linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 4/9] crypto, lzo: Implement zbufsize()
Date: Thu, 2 Aug 2018 14:51:13 -0700 [thread overview]
Message-ID: <20180802215118.17752-5-keescook@chromium.org> (raw)
In-Reply-To: <20180802215118.17752-1-keescook@chromium.org>
This implements the worst-case compression size querying interface for
lzo, based on the logic originally used by pstore.
Signed-off-by: Kees Cook <keescook@chromium.org>
---
crypto/lzo.c | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/crypto/lzo.c b/crypto/lzo.c
index 218567d717d6..ea18f62c5247 100644
--- a/crypto/lzo.c
+++ b/crypto/lzo.c
@@ -120,6 +120,24 @@ static int lzo_sdecompress(struct crypto_scomp *tfm, const u8 *src,
return __lzo_decompress(src, slen, dst, dlen);
}
+static int __lzo_zbufsize(unsigned int slen, unsigned int *dlen)
+{
+ *dlen = lzo1x_worst_compress(slen);
+ return 0;
+}
+
+static int lzo_zbufsize(struct crypto_tfm *tfm, unsigned int slen,
+ unsigned int *dlen)
+{
+ return __lzo_zbufsize(slen, dlen);
+}
+
+static int lzo_szbufsize(struct crypto_scomp *tfm, unsigned int slen,
+ unsigned int *dlen, void *ctx)
+{
+ return __lzo_zbufsize(slen, dlen);
+}
+
static struct crypto_alg alg = {
.cra_name = "lzo",
.cra_flags = CRYPTO_ALG_TYPE_COMPRESS,
@@ -129,7 +147,8 @@ static struct crypto_alg alg = {
.cra_exit = lzo_exit,
.cra_u = { .compress = {
.coa_compress = lzo_compress,
- .coa_decompress = lzo_decompress } }
+ .coa_decompress = lzo_decompress,
+ .coa_zbufsize = lzo_zbufsize } }
};
static struct scomp_alg scomp = {
@@ -137,6 +156,7 @@ static struct scomp_alg scomp = {
.free_ctx = lzo_free_ctx,
.compress = lzo_scompress,
.decompress = lzo_sdecompress,
+ .zbufsize = lzo_szbufsize,
.base = {
.cra_name = "lzo",
.cra_driver_name = "lzo-scomp",
--
2.17.1
next prev parent reply other threads:[~2018-08-02 21:51 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-02 21:51 [PATCH 0/9] crypto: add zbufsize() interface Kees Cook
2018-08-02 21:51 ` [PATCH 1/9] " Kees Cook
2018-08-07 9:45 ` Herbert Xu
2018-08-07 18:10 ` Kees Cook
2018-08-08 2:53 ` Herbert Xu
2021-12-01 23:39 ` Kees Cook
2021-12-02 1:58 ` Herbert Xu
2021-12-02 3:51 ` Kees Cook
2021-12-02 3:57 ` Herbert Xu
2021-12-02 8:10 ` Kees Cook
2021-12-03 2:28 ` Herbert Xu
2021-12-03 20:49 ` Dmitry Torokhov
2021-12-07 5:20 ` Herbert Xu
2021-12-07 6:24 ` Dmitry Torokhov
2021-12-07 6:27 ` Herbert Xu
2018-08-02 21:51 ` [PATCH 2/9] crypto, 842: implement zbufsize() Kees Cook
2018-08-02 21:51 ` [PATCH 3/9] crypto, null: Implement zbufsize() Kees Cook
2018-08-02 21:51 ` Kees Cook [this message]
2018-08-02 21:51 ` [PATCH 5/9] crypto, deflate: " Kees Cook
2018-08-02 21:51 ` [PATCH 6/9] crypto, zstd: " Kees Cook
2018-08-02 21:51 ` [PATCH 7/9] crypto, lz4: " Kees Cook
2018-08-02 21:51 ` [PATCH 8/9] crypto, lz4hc: " Kees Cook
2018-08-02 21:51 ` [PATCH 9/9] pstore: Use crypto_comp_zbufsize() Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180802215118.17752-5-keescook@chromium.org \
--to=keescook@chromium.org \
--cc=anton@enomsg.org \
--cc=arnd@arndb.de \
--cc=ccross@android.com \
--cc=geliangtang@gmail.com \
--cc=haren@us.ibm.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tony.luck@intel.com \
--cc=wangzhou1@hisilicon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).