mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-01-16 19:45:39 +00:00
f75f66683d
In commit 42d9f6c77479 ("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: 42d9f6c77479 ("crypto: acomp - Move scomp stream allocation code into acomp")
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
109 lines
2.8 KiB
C
109 lines
2.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
/*
|
|
* Synchronous Compression operations
|
|
*
|
|
* Copyright 2015 LG Electronics Inc.
|
|
* Copyright (c) 2016, Intel Corporation
|
|
* Author: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
|
|
*/
|
|
#ifndef _CRYPTO_SCOMP_INT_H
|
|
#define _CRYPTO_SCOMP_INT_H
|
|
|
|
#include <crypto/internal/acompress.h>
|
|
|
|
struct crypto_scomp {
|
|
struct crypto_tfm base;
|
|
};
|
|
|
|
/**
|
|
* struct scomp_alg - synchronous compression algorithm
|
|
*
|
|
* @compress: Function performs a compress operation
|
|
* @decompress: Function performs a de-compress operation
|
|
* @streams: Per-cpu memory for algorithm
|
|
* @calg: Cmonn algorithm data structure shared with acomp
|
|
*/
|
|
struct scomp_alg {
|
|
int (*compress)(struct crypto_scomp *tfm, const u8 *src,
|
|
unsigned int slen, u8 *dst, unsigned int *dlen,
|
|
void *ctx);
|
|
int (*decompress)(struct crypto_scomp *tfm, const u8 *src,
|
|
unsigned int slen, u8 *dst, unsigned int *dlen,
|
|
void *ctx);
|
|
|
|
struct crypto_acomp_streams streams;
|
|
|
|
union {
|
|
struct COMP_ALG_COMMON;
|
|
struct comp_alg_common calg;
|
|
};
|
|
};
|
|
|
|
static inline struct scomp_alg *__crypto_scomp_alg(struct crypto_alg *alg)
|
|
{
|
|
return container_of(alg, struct scomp_alg, base);
|
|
}
|
|
|
|
static inline struct crypto_scomp *__crypto_scomp_tfm(struct crypto_tfm *tfm)
|
|
{
|
|
return container_of(tfm, struct crypto_scomp, base);
|
|
}
|
|
|
|
static inline struct crypto_tfm *crypto_scomp_tfm(struct crypto_scomp *tfm)
|
|
{
|
|
return &tfm->base;
|
|
}
|
|
|
|
static inline void crypto_free_scomp(struct crypto_scomp *tfm)
|
|
{
|
|
crypto_destroy_tfm(tfm, crypto_scomp_tfm(tfm));
|
|
}
|
|
|
|
static inline struct scomp_alg *crypto_scomp_alg(struct crypto_scomp *tfm)
|
|
{
|
|
return __crypto_scomp_alg(crypto_scomp_tfm(tfm)->__crt_alg);
|
|
}
|
|
|
|
static inline int crypto_scomp_compress(struct crypto_scomp *tfm,
|
|
const u8 *src, unsigned int slen,
|
|
u8 *dst, unsigned int *dlen, void *ctx)
|
|
{
|
|
return crypto_scomp_alg(tfm)->compress(tfm, src, slen, dst, dlen, ctx);
|
|
}
|
|
|
|
static inline int crypto_scomp_decompress(struct crypto_scomp *tfm,
|
|
const u8 *src, unsigned int slen,
|
|
u8 *dst, unsigned int *dlen,
|
|
void *ctx)
|
|
{
|
|
return crypto_scomp_alg(tfm)->decompress(tfm, src, slen, dst, dlen,
|
|
ctx);
|
|
}
|
|
|
|
/**
|
|
* crypto_register_scomp() -- Register synchronous compression algorithm
|
|
*
|
|
* Function registers an implementation of a synchronous
|
|
* compression algorithm
|
|
*
|
|
* @alg: algorithm definition
|
|
*
|
|
* Return: zero on success; error code in case of error
|
|
*/
|
|
int crypto_register_scomp(struct scomp_alg *alg);
|
|
|
|
/**
|
|
* crypto_unregister_scomp() -- Unregister synchronous compression algorithm
|
|
*
|
|
* Function unregisters an implementation of a synchronous
|
|
* compression algorithm
|
|
*
|
|
* @alg: algorithm definition
|
|
*/
|
|
void crypto_unregister_scomp(struct scomp_alg *alg);
|
|
|
|
int crypto_register_scomps(struct scomp_alg *algs, int count);
|
|
void crypto_unregister_scomps(struct scomp_alg *algs, int count);
|
|
|
|
#endif
|