From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21148C76195 for ; Mon, 15 Jul 2019 13:40:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E4E1E21537 for ; Mon, 15 Jul 2019 13:40:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563198005; bh=FTKJOaDBqWWGx5K6l7a3GQeiN9iEecrkXmoJNkID+74=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0pti1lDf8q8DxrrBzlzD2FjIOAZmZcQ4MJrocXi0b7RHy5G95Nfv3l1IFP/XQxUFS gKxn7Eo7PeeY4rkxqljqfZzTjQbY7Zs8KHZfJT+t0G77ECvjX1F12EZiWeYVbxR2Wc evR60oegdxP5KeEEy53/OEK0otTHLisWJUr651l8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731359AbfGONkD (ORCPT ); Mon, 15 Jul 2019 09:40:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:41650 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731354AbfGONkC (ORCPT ); Mon, 15 Jul 2019 09:40:02 -0400 Received: from sasha-vm.mshome.net (unknown [73.61.17.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6532321530; Mon, 15 Jul 2019 13:40:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563198001; bh=FTKJOaDBqWWGx5K6l7a3GQeiN9iEecrkXmoJNkID+74=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RGgGeG+lZSFdupfdn2tznN7C2qv+oYdY7DRpz/n1VzBEGfQ14CKHgJnrcclPNQ4LG He+dnoDkznCpNKRc4g1NxcypeEBpRmS6nnFghLeVBv7hH1DjVayt9UiHUszXhxaMdt 4VKOsfqkrfFYZ3G7qgOMg6r45lJqcpkUQ3JwVtp8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Christophe Leroy , =?UTF-8?q?Horia=20Geant=C4=83?= , Herbert Xu , Sasha Levin , linux-crypto@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 013/158] crypto: talitos - fix skcipher failure due to wrong output IV Date: Mon, 15 Jul 2019 09:36:58 -0400 Message-Id: <20190715133923.2890-13-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715133923.2890-1-sashal@kernel.org> References: <20190715133923.2890-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org From: Christophe Leroy [ Upstream commit 3e03e792865ae48b8cfc69a0b4d65f02f467389f ] Selftests report the following: [ 2.984845] alg: skcipher: cbc-aes-talitos encryption test failed (wrong output IV) on test vector 0, cfg="in-place" [ 2.995377] 00000000: 3d af ba 42 9d 9e b4 30 b4 22 da 80 2c 9f ac 41 [ 3.032673] alg: skcipher: cbc-des-talitos encryption test failed (wrong output IV) on test vector 0, cfg="in-place" [ 3.043185] 00000000: fe dc ba 98 76 54 32 10 [ 3.063238] alg: skcipher: cbc-3des-talitos encryption test failed (wrong output IV) on test vector 0, cfg="in-place" [ 3.073818] 00000000: 7d 33 88 93 0f 93 b2 42 This above dumps show that the actual output IV is indeed the input IV. This is due to the IV not being copied back into the request. This patch fixes that. Signed-off-by: Christophe Leroy Reviewed-by: Horia Geantă Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/talitos.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index c5859d3cb825..9cc5309a3fbf 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -1571,11 +1571,15 @@ static void ablkcipher_done(struct device *dev, int err) { struct ablkcipher_request *areq = context; + struct crypto_ablkcipher *cipher = crypto_ablkcipher_reqtfm(areq); + struct talitos_ctx *ctx = crypto_ablkcipher_ctx(cipher); + unsigned int ivsize = crypto_ablkcipher_ivsize(cipher); struct talitos_edesc *edesc; edesc = container_of(desc, struct talitos_edesc, desc); common_nonsnoop_unmap(dev, edesc, areq); + memcpy(areq->info, ctx->iv, ivsize); kfree(edesc); -- 2.20.1