Received: by 10.192.165.156 with SMTP id m28csp2328466imm; Sat, 14 Apr 2018 21:17:44 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/nbCAvCkT0eyplOJ+43JWgV6ZUT2H1UBirSFSi5/rbb5BhLsvU3dOhgDLqmYVvJPXQtH9k X-Received: by 10.99.124.20 with SMTP id x20mr5955889pgc.161.1523765864505; Sat, 14 Apr 2018 21:17:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523765864; cv=none; d=google.com; s=arc-20160816; b=U2n6mB2jMSz4pWMEDQjFCjAGdpY22Ro9oOy1Ba6qfh2YH5q2GKht83D0oUFeDmJT5o AfIu9CZ+dCB32kNa7ZnCdZ8l48Bp4DAajXATMddVpJNf5+ghFlx5r3geEefp/wuNSRRa 50xmhKpvkywz5qBmd9BASkJTKJxYunLrcxFwcmYQJKWbf3UXFJYejxk8iJ4u6ASeVeIN tn3BRehm3OAZZE3QvOUzeouMvVzw3fKAyl5LW1MmZbXnNb5hzvVkDIoayPWeuLafp+xH Ad9LqSh87J35xoVADCOuCZxKkzQv8d1gbFuwcXCxmmKj0LOD0hVkkDYU9EEqANrYhKpM MkLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=gUfK/nIWH2WZ0cPWzHMVPOKuG2+XZpBJalyPPG4TMJ4=; b=H2//rpBv/vAiEGdMFepNIY5JZWQCvX97bqwMUJnH/7765+hNHFdN2uWyyj5Ej99scB +Juon8A4m6F8tKnvfAEJyLDEUrGF0KKwL9GIzBcUMsTVIR84GcTJ2diYyCbDHyyjp6X4 9NIuWkSCcVtSRR4yGCK+gw9DX4DFyYlRzN2rvSrOSYyXBQhGw0+gTRtXQFK6zwL7ZtSn G9djhWDzgKt27TzjCABMNJz7kVOpLItjqjkkfZx7adIWAVvsNPlnbRgVsRLFSDX8I649 nkceCnrte5OI5j+mBDfanutFRQr1mMJoo/+sFpc+W/ayE+ldEyPmCFooWiKRcL96g/9r gikQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 33-v6si1963563plg.34.2018.04.14.21.17.30; Sat, 14 Apr 2018 21:17:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752494AbeDOEQD (ORCPT + 99 others); Sun, 15 Apr 2018 00:16:03 -0400 Received: from mx2.suse.de ([195.135.220.15]:41934 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752371AbeDOEP7 (ORCPT ); Sun, 15 Apr 2018 00:15:59 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 09185AEBF; Sun, 15 Apr 2018 04:15:58 +0000 (UTC) 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 2/4] x86/crypto: cast6: Fix function prototypes Date: Sun, 15 Apr 2018 01:15:40 -0300 Message-Id: <20180415041542.5364-3-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 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert the use of 'struct cast6_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. Signed-off-by: João Moreira --- arch/x86/crypto/cast6_avx_glue.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/arch/x86/crypto/cast6_avx_glue.c b/arch/x86/crypto/cast6_avx_glue.c index 50e684768c55..f4e05388fbbb 100644 --- a/arch/x86/crypto/cast6_avx_glue.c +++ b/arch/x86/crypto/cast6_avx_glue.c @@ -41,20 +41,16 @@ #define CAST6_PARALLEL_BLOCKS 8 -asmlinkage void cast6_ecb_enc_8way(struct cast6_ctx *ctx, u8 *dst, - const u8 *src); -asmlinkage void cast6_ecb_dec_8way(struct cast6_ctx *ctx, u8 *dst, - const u8 *src); - -asmlinkage void cast6_cbc_dec_8way(struct cast6_ctx *ctx, u8 *dst, - const u8 *src); -asmlinkage void cast6_ctr_8way(struct cast6_ctx *ctx, u8 *dst, const u8 *src, - le128 *iv); - -asmlinkage void cast6_xts_enc_8way(struct cast6_ctx *ctx, u8 *dst, - const u8 *src, le128 *iv); -asmlinkage void cast6_xts_dec_8way(struct cast6_ctx *ctx, u8 *dst, - const u8 *src, le128 *iv); +asmlinkage void cast6_ecb_enc_8way(void *ctx, u8 *dst, const u8 *src); +asmlinkage void cast6_ecb_dec_8way(void *ctx, u8 *dst, const u8 *src); + +asmlinkage void cast6_cbc_dec_8way(void *ctx, u8 *dst, const u8 *src); +asmlinkage void cast6_ctr_8way(void *ctx, u8 *dst, const u8 *src, le128 *iv); + +asmlinkage void cast6_xts_enc_8way(void *ctx, u8 *dst, const u8 *src, + le128 *iv); +asmlinkage void cast6_xts_dec_8way(void *ctx, u8 *dst, const u8 *src, + le128 *iv); static void cast6_xts_enc(void *ctx, u128 *dst, const u128 *src, le128 *iv) { -- 2.12.0