Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp82675yba; Mon, 20 May 2019 05:24:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqzsoiWNkO6PkJne8FnjoyXf2Ayn7t57Ga1mSB5ABnt/mRI2giMS/dk76nPxHKtBEYEJwIqY X-Received: by 2002:a17:902:778d:: with SMTP id o13mr17920683pll.275.1558355053158; Mon, 20 May 2019 05:24:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558355053; cv=none; d=google.com; s=arc-20160816; b=inGFIBFUq6Hyj2nqrqpikbXmDzP0tALOI/cn4FvwpgqzepyziDrQKZUSmEcbRPDMG2 ZJIx1DDIaAx2xcUd+0HPs0eAZ9vJvrQbEwJZ3dfpIcLCXDwdwua4jjMcDXlPvzM3D7eh kW4iIAfgvljs3UikgLCM8WRpXJIOuFq+oauW6rJXnvZRiERkEMXn5TFvN2iFv+ukR2tT nbQ1JUnnrP7BRk6py9cB6BHYxp1AqXHkxmjKrpKbFVmbcLzGOl0vcUYwcS+ZPmldGPR7 AdWmp5I5/Hd57Q/33ROAsXP3ywD5y1iJYKKYdmZskFBLVzhh4x+jJxxVJHMibJzRHNQ7 l30A== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Mjv2f7mX54AbQ37TagO8JUhqIhEcaDU8kmSAlN9GG8k=; b=uGL2pmFWkF57Za6wUVoOP0ldWS3NR2dEQTsN1xfkFI/uzNmhlxabXMqsVvZ+ERcAz/ uueQJC8V5W5/Qrwg6jEca3L6wPSWVIMqa6+KvH2u+YVC5yB4SjA/2+kUm2+i+9ihYw8J G+04i6MAGVDGFjZKa/xesjXHXr+Sw1szr5uRBmHlzS71W4VHNtZT3J+QkNXXbLZOLilR d1tkkY4UYSRm/a3N0s53dFpztW3hloSA7wH+X7KHbAXIMNlPaYGH4iAhiFLBPSqSww3m sH52qOXHcAnNyjOq2A6m2md5WB70Bz4YiOE73L063oaBb+VnBSTVmyj1rPHr8pyqazrW kMYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Q6odNlq0; 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 v70si13959142pgd.317.2019.05.20.05.23.58; Mon, 20 May 2019 05:24:13 -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; dkim=pass header.i=@kernel.org header.s=default header.b=Q6odNlq0; 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 S2388238AbfETMV5 (ORCPT + 99 others); Mon, 20 May 2019 08:21:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:35768 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388328AbfETMVy (ORCPT ); Mon, 20 May 2019 08:21:54 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 74CCA21479; Mon, 20 May 2019 12:21:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558354914; bh=uhh8Vg9x5wvRtl1mwTABIvrWtt1cWlVM/KKhsPkU4vE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q6odNlq0z79e6j5nWGEqrJ2ij0l6Rx4dnpgvQOXpJdismwDz0a6NWxCwwREg2WyQO ltC9ZM+xk5NX74fXFgy2/ZR3z2Uo99utsv4ZpYWRTAZV1+2zeq/oKFVHj/spQcAg/Z 0Wq4afPxJoVdp+UnzIhZdeS9pJmLrJoilB2a9MeM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tim Chen , Eric Biggers , Herbert Xu Subject: [PATCH 4.19 026/105] crypto: x86/crct10dif-pcl - fix use via crypto_shash_digest() Date: Mon, 20 May 2019 14:13:32 +0200 Message-Id: <20190520115248.841736226@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520115247.060821231@linuxfoundation.org> References: <20190520115247.060821231@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Eric Biggers commit dec3d0b1071a0f3194e66a83d26ecf4aa8c5910e upstream. The ->digest() method of crct10dif-pclmul reads the current CRC value from the shash_desc context. But this value is uninitialized, causing crypto_shash_digest() to compute the wrong result. Fix it. Probably this wasn't noticed before because lib/crc-t10dif.c only uses crypto_shash_update(), not crypto_shash_digest(). Likewise, crypto_shash_digest() is not yet tested by the crypto self-tests because those only test the ahash API which only uses shash init/update/final. Fixes: 0b95a7f85718 ("crypto: crct10dif - Glue code to cast accelerated CRCT10DIF assembly as a crypto transform") Cc: # v3.11+ Cc: Tim Chen Signed-off-by: Eric Biggers Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- arch/x86/crypto/crct10dif-pclmul_glue.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) --- a/arch/x86/crypto/crct10dif-pclmul_glue.c +++ b/arch/x86/crypto/crct10dif-pclmul_glue.c @@ -76,15 +76,14 @@ static int chksum_final(struct shash_des return 0; } -static int __chksum_finup(__u16 *crcp, const u8 *data, unsigned int len, - u8 *out) +static int __chksum_finup(__u16 crc, const u8 *data, unsigned int len, u8 *out) { if (irq_fpu_usable()) { kernel_fpu_begin(); - *(__u16 *)out = crc_t10dif_pcl(*crcp, data, len); + *(__u16 *)out = crc_t10dif_pcl(crc, data, len); kernel_fpu_end(); } else - *(__u16 *)out = crc_t10dif_generic(*crcp, data, len); + *(__u16 *)out = crc_t10dif_generic(crc, data, len); return 0; } @@ -93,15 +92,13 @@ static int chksum_finup(struct shash_des { struct chksum_desc_ctx *ctx = shash_desc_ctx(desc); - return __chksum_finup(&ctx->crc, data, len, out); + return __chksum_finup(ctx->crc, data, len, out); } static int chksum_digest(struct shash_desc *desc, const u8 *data, unsigned int length, u8 *out) { - struct chksum_desc_ctx *ctx = shash_desc_ctx(desc); - - return __chksum_finup(&ctx->crc, data, length, out); + return __chksum_finup(0, data, length, out); } static struct shash_alg alg = {