diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-29 14:48:41 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-29 14:48:41 +0200 |
| commit | 7ab24bfdf9a9a9f87ac8e5ad9a25f80b5b947be7 (patch) | |
| tree | 897d12fb7498316d05ce2ed48722fc78b61fc4e1 /crypto/zlib.c | |
| parent | netfilter: Fix ip_route_me_harder triggering ip_rt_bug (diff) | |
| download | linux-7ab24bfdf9a9a9f87ac8e5ad9a25f80b5b947be7.tar.xz linux-7ab24bfdf9a9a9f87ac8e5ad9a25f80b5b947be7.zip | |
net+crypto: Use vmalloc for zlib inflate buffers.
They are 64K and result in order-4 allocations, even with SLUB.
Therefore, just like we always have for the deflate buffers, use
vmalloc.
Reported-by: Martin Jackson <mjackson220.list@gmail.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'crypto/zlib.c')
| -rw-r--r-- | crypto/zlib.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crypto/zlib.c b/crypto/zlib.c index d11d761a5e41..06b62e5cdcc7 100644 --- a/crypto/zlib.c +++ b/crypto/zlib.c @@ -29,7 +29,6 @@ #include <linux/interrupt.h> #include <linux/mm.h> #include <linux/net.h> -#include <linux/slab.h> #include <crypto/internal/compress.h> @@ -60,7 +59,7 @@ static void zlib_decomp_exit(struct zlib_ctx *ctx) if (stream->workspace) { zlib_inflateEnd(stream); - kfree(stream->workspace); + vfree(stream->workspace); stream->workspace = NULL; } } @@ -228,13 +227,13 @@ static int zlib_decompress_setup(struct crypto_pcomp *tfm, void *params, ? nla_get_u32(tb[ZLIB_DECOMP_WINDOWBITS]) : DEF_WBITS; - stream->workspace = kzalloc(zlib_inflate_workspacesize(), GFP_KERNEL); + stream->workspace = vzalloc(zlib_inflate_workspacesize()); if (!stream->workspace) return -ENOMEM; ret = zlib_inflateInit2(stream, ctx->decomp_windowBits); if (ret != Z_OK) { - kfree(stream->workspace); + vfree(stream->workspace); stream->workspace = NULL; return -EINVAL; } |