mirror of
https://github.com/torvalds/linux.git
synced 2025-10-31 16:48:26 +02:00
f75f66683d
In commit42d9f6c774("crypto: acomp - Move scomp stream allocation code into acomp"), the crypto_acomp_streams struct was made to rely on having the alloc_ctx and free_ctx operations defined in the same order as the scomp_alg struct. But in that same commit, the alloc_ctx and free_ctx members of scomp_alg may be randomized by structure layout randomization, since they are contained in a pure ops structure (containing only function pointers). If the pointers within scomp_alg are randomized, but those in crypto_acomp_streams are not, then the order may no longer match. This fixes the problem by removing the union from scomp_alg so that both crypto_acomp_streams and scomp_alg will share the same definition of alloc_ctx and free_ctx, ensuring they will always have the same layout. Signed-off-by: Dan Moulding <dan@danm.net> Suggested-by: Herbert Xu <herbert@gondor.apana.org.au> Fixes:42d9f6c774("crypto: acomp - Move scomp stream allocation code into acomp") Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
101 lines
2 KiB
C
101 lines
2 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Cryptographic API.
|
|
*/
|
|
|
|
#include <crypto/internal/scompress.h>
|
|
#include <linux/init.h>
|
|
#include <linux/lzo.h>
|
|
#include <linux/module.h>
|
|
#include <linux/slab.h>
|
|
|
|
static void *lzo_alloc_ctx(void)
|
|
{
|
|
void *ctx;
|
|
|
|
ctx = kvmalloc(LZO1X_MEM_COMPRESS, GFP_KERNEL);
|
|
if (!ctx)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
return ctx;
|
|
}
|
|
|
|
static void lzo_free_ctx(void *ctx)
|
|
{
|
|
kvfree(ctx);
|
|
}
|
|
|
|
static int __lzo_compress(const u8 *src, unsigned int slen,
|
|
u8 *dst, unsigned int *dlen, void *ctx)
|
|
{
|
|
size_t tmp_len = *dlen; /* size_t(ulong) <-> uint on 64 bit */
|
|
int err;
|
|
|
|
err = lzo1x_1_compress_safe(src, slen, dst, &tmp_len, ctx);
|
|
|
|
if (err != LZO_E_OK)
|
|
return -EINVAL;
|
|
|
|
*dlen = tmp_len;
|
|
return 0;
|
|
}
|
|
|
|
static int lzo_scompress(struct crypto_scomp *tfm, const u8 *src,
|
|
unsigned int slen, u8 *dst, unsigned int *dlen,
|
|
void *ctx)
|
|
{
|
|
return __lzo_compress(src, slen, dst, dlen, ctx);
|
|
}
|
|
|
|
static int __lzo_decompress(const u8 *src, unsigned int slen,
|
|
u8 *dst, unsigned int *dlen)
|
|
{
|
|
int err;
|
|
size_t tmp_len = *dlen; /* size_t(ulong) <-> uint on 64 bit */
|
|
|
|
err = lzo1x_decompress_safe(src, slen, dst, &tmp_len);
|
|
|
|
if (err != LZO_E_OK)
|
|
return -EINVAL;
|
|
|
|
*dlen = tmp_len;
|
|
return 0;
|
|
}
|
|
|
|
static int lzo_sdecompress(struct crypto_scomp *tfm, const u8 *src,
|
|
unsigned int slen, u8 *dst, unsigned int *dlen,
|
|
void *ctx)
|
|
{
|
|
return __lzo_decompress(src, slen, dst, dlen);
|
|
}
|
|
|
|
static struct scomp_alg scomp = {
|
|
.streams = {
|
|
.alloc_ctx = lzo_alloc_ctx,
|
|
.free_ctx = lzo_free_ctx,
|
|
},
|
|
.compress = lzo_scompress,
|
|
.decompress = lzo_sdecompress,
|
|
.base = {
|
|
.cra_name = "lzo",
|
|
.cra_driver_name = "lzo-scomp",
|
|
.cra_module = THIS_MODULE,
|
|
}
|
|
};
|
|
|
|
static int __init lzo_mod_init(void)
|
|
{
|
|
return crypto_register_scomp(&scomp);
|
|
}
|
|
|
|
static void __exit lzo_mod_fini(void)
|
|
{
|
|
crypto_unregister_scomp(&scomp);
|
|
}
|
|
|
|
module_init(lzo_mod_init);
|
|
module_exit(lzo_mod_fini);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_DESCRIPTION("LZO Compression Algorithm");
|
|
MODULE_ALIAS_CRYPTO("lzo");
|