From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx4+z7FwIKtTp0BQnXO9MBYiTAK9/PnGPEcBUZPOLlk/VZhpse0zKk3yb2BNHhhnDn/frnHd5 ARC-Seal: i=1; a=rsa-sha256; t=1523765766; cv=none; d=google.com; s=arc-20160816; b=gUaovWplr0EnB8ZcMmsFuoXAqrVGUcQCZIE5hwXGhp7poCsZy+xAIsNqyM8OTP7Lo0 K/9e/thHi+XEgQiuoBCFx3ljIW0UU9E8m/Hq01lIe5Wm/+On3vbJ39/O8j+vwjhyjJ+E qjpL4GvOUf+GnkmUitXNeDq4z+I8ktxPa476FLgfCVotqv5C2iPxVVXxXnZCv0ZLWJFt xP9JKS1CfxeI8/iRUu7jTva6e+ur6u8EY0pAHaAs/s2spH2pHZnA6B7w2/TiouSH8YeS LkJIeRkNkFh3hKL2rwzZ6oGdgvJp7y4jV+/HvWisSUDmS6uN9Tn78FqUIpBLxpMlpi3r 7lOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=9YVxwBIlHGKLw1GOc+0/mNMJgNqwaHghqaoeXG7AimE=; b=DgXfJW6vxLL9cdoX/mM+PB8QdBChwnvjV/hCfGJdZBKfCrlfTq1nnyg+eHN/QrbJhg oWZMpwGWgxrhecqLAcyT3m4YFXWLb7SHGqtpGYG4AoGSJQdwN3iyp9Fk5/S2i7B0+KuW xC9lJtLUzfZGN7rFr7gN1s3gQE9PYM5nVEyLNH4W1YpYZKnsynSkbdbzb4t94xQynFJD bKdb+NUbolIKPPwde3qaHn5a1v51wQ/UCzCeN6K4ujGr7rw297aIU0fR54KUq8iL5SDW kA+5zaou6iVMFOoUs3jPU0cC38TM8H1btqjWkslT2PKCfynrQdRo6Ib10zvvoeS5M6by vGDw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of jmoreira@suse.de designates 195.135.220.15 as permitted sender) smtp.mailfrom=jmoreira@suse.de Authentication-Results: mx.google.com; spf=pass (google.com: domain of jmoreira@suse.de designates 195.135.220.15 as permitted sender) smtp.mailfrom=jmoreira@suse.de From: Joao Moreira To: kernel-hardening@lists.openwall.com Cc: linux-kernel@vger.kernel.org, x86@kernel.org, herbert@gondor.apana.org.au, davem@davemloft.net, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, gregkh@linuxfoundation.org, keescook@chromium.org Subject: [PATCH 4/4] x86/crypto: twofish: Fix function prototypes Date: Sun, 15 Apr 2018 01:15:42 -0300 Message-Id: <20180415041542.5364-5-jmoreira@suse.de> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180415041542.5364-1-jmoreira@suse.de> References: <20180415041542.5364-1-jmoreira@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1597784211793115632?= X-GMAIL-MSGID: =?utf-8?q?1597784211793115632?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Convert the use of 'struct twofish_ctx *' to 'void *' in prototypes of functions which are referenced through 'struct common_glue_func_entry', making their prototypes match those of this struct and, consequently, turning them compatible with CFI requirements. Whenever needed, cast 'void *' to 'struct twofish_ctx *'. Signed-off-by: João Moreira --- arch/x86/crypto/twofish_avx_glue.c | 30 +++++++++++++----------------- arch/x86/crypto/twofish_glue.c | 7 +++---- arch/x86/crypto/twofish_glue_3way.c | 10 ++++------ arch/x86/include/asm/crypto/twofish.h | 9 +++------ 4 files changed, 23 insertions(+), 33 deletions(-) diff --git a/arch/x86/crypto/twofish_avx_glue.c b/arch/x86/crypto/twofish_avx_glue.c index b7a3904b953c..916a4904fa25 100644 --- a/arch/x86/crypto/twofish_avx_glue.c +++ b/arch/x86/crypto/twofish_avx_glue.c @@ -46,25 +46,21 @@ #define TWOFISH_PARALLEL_BLOCKS 8 /* 8-way parallel cipher functions */ -asmlinkage void twofish_ecb_enc_8way(struct twofish_ctx *ctx, u8 *dst, - const u8 *src); -asmlinkage void twofish_ecb_dec_8way(struct twofish_ctx *ctx, u8 *dst, - const u8 *src); - -asmlinkage void twofish_cbc_dec_8way(struct twofish_ctx *ctx, u8 *dst, - const u8 *src); -asmlinkage void twofish_ctr_8way(struct twofish_ctx *ctx, u8 *dst, - const u8 *src, le128 *iv); - -asmlinkage void twofish_xts_enc_8way(struct twofish_ctx *ctx, u8 *dst, - const u8 *src, le128 *iv); -asmlinkage void twofish_xts_dec_8way(struct twofish_ctx *ctx, u8 *dst, - const u8 *src, le128 *iv); - -static inline void twofish_enc_blk_3way(struct twofish_ctx *ctx, u8 *dst, +asmlinkage void twofish_ecb_enc_8way(void *ctx, u8 *dst, const u8 *src); +asmlinkage void twofish_ecb_dec_8way(void *ctx, u8 *dst, const u8 *src); + +asmlinkage void twofish_cbc_dec_8way(void *ctx, u8 *dst, const u8 *src); +asmlinkage void twofish_ctr_8way(void *ctx, u8 *dst, const u8 *src, le128 *iv); + +asmlinkage void twofish_xts_enc_8way(void *ctx, u8 *dst, const u8 *src, + le128 *iv); +asmlinkage void twofish_xts_dec_8way(void *ctx, u8 *dst, const u8 *src, + le128 *iv); + +static inline void twofish_enc_blk_3way(void *ctx, u8 *dst, const u8 *src) { - __twofish_enc_blk_3way(ctx, dst, src, false); + __twofish_enc_blk_3way((struct twofish_ctx *) ctx, dst, src, false); } static void twofish_xts_enc(void *ctx, u128 *dst, const u128 *src, le128 *iv) diff --git a/arch/x86/crypto/twofish_glue.c b/arch/x86/crypto/twofish_glue.c index 77e06c2da83d..3dee618c2dd2 100644 --- a/arch/x86/crypto/twofish_glue.c +++ b/arch/x86/crypto/twofish_glue.c @@ -44,11 +44,10 @@ #include #include -asmlinkage void twofish_enc_blk(struct twofish_ctx *ctx, u8 *dst, - const u8 *src); +asmlinkage void twofish_enc_blk(void *ctx, u8 *dst, const u8 *src); EXPORT_SYMBOL_GPL(twofish_enc_blk); -asmlinkage void twofish_dec_blk(struct twofish_ctx *ctx, u8 *dst, - const u8 *src); + +asmlinkage void twofish_dec_blk(void *ctx, u8 *dst, const u8 *src); EXPORT_SYMBOL_GPL(twofish_dec_blk); static void twofish_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src) diff --git a/arch/x86/crypto/twofish_glue_3way.c b/arch/x86/crypto/twofish_glue_3way.c index 243e90a4b5d9..ce25be1bc260 100644 --- a/arch/x86/crypto/twofish_glue_3way.c +++ b/arch/x86/crypto/twofish_glue_3way.c @@ -36,16 +36,14 @@ EXPORT_SYMBOL_GPL(__twofish_enc_blk_3way); EXPORT_SYMBOL_GPL(twofish_dec_blk_3way); -static inline void twofish_enc_blk_3way(struct twofish_ctx *ctx, u8 *dst, - const u8 *src) +static inline void twofish_enc_blk_3way(void *ctx, u8 *dst, const u8 *src) { - __twofish_enc_blk_3way(ctx, dst, src, false); + __twofish_enc_blk_3way((struct twofish_ctx *) ctx, dst, src, false); } -static inline void twofish_enc_blk_xor_3way(struct twofish_ctx *ctx, u8 *dst, - const u8 *src) +static inline void twofish_enc_blk_xor_3way(void *ctx, u8 *dst, const u8 *src) { - __twofish_enc_blk_3way(ctx, dst, src, true); + __twofish_enc_blk_3way((struct twofish_ctx *) ctx, dst, src, true); } void twofish_dec_blk_cbc_3way(void *ctx, u128 *dst, const u128 *src) diff --git a/arch/x86/include/asm/crypto/twofish.h b/arch/x86/include/asm/crypto/twofish.h index 65bb80adba3e..871eaa7bacdc 100644 --- a/arch/x86/include/asm/crypto/twofish.h +++ b/arch/x86/include/asm/crypto/twofish.h @@ -18,16 +18,13 @@ struct twofish_xts_ctx { }; /* regular block cipher functions from twofish_x86_64 module */ -asmlinkage void twofish_enc_blk(struct twofish_ctx *ctx, u8 *dst, - const u8 *src); -asmlinkage void twofish_dec_blk(struct twofish_ctx *ctx, u8 *dst, - const u8 *src); +asmlinkage void twofish_enc_blk(void *ctx, u8 *dst, const u8 *src); +asmlinkage void twofish_dec_blk(void *ctx, u8 *dst, const u8 *src); /* 3-way parallel cipher functions */ asmlinkage void __twofish_enc_blk_3way(struct twofish_ctx *ctx, u8 *dst, const u8 *src, bool xor); -asmlinkage void twofish_dec_blk_3way(struct twofish_ctx *ctx, u8 *dst, - const u8 *src); +asmlinkage void twofish_dec_blk_3way(void *ctx, u8 *dst, const u8 *src); /* helpers from twofish_x86_64-3way module */ extern void twofish_dec_blk_cbc_3way(void *ctx, u128 *dst, const u128 *src); -- 2.12.0