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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 2A369C7618F for ; Wed, 24 Jul 2019 20:08:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E3CD6214AF for ; Wed, 24 Jul 2019 20:08:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563998924; bh=Tiw9wrVuP8FVL6ODanQa3/r4I5xRYoyg/j0dQmxR1xY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2pdybdZc/TYcC0oI/G38JnAXpdrZahzOE6C03zUwgULugdiU/uq5Iqs/Kx/hBULkF 1/l8TyF2EGWljTks2OLOWsfGDH0Whjg3rAScRXr7abWSJocs6PxEfcaoDDWdbLZeEi o+jFa5NWM0pDpfzrzYOM2M4RGSRtOo9ItnpcWtNA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392310AbfGXUBo (ORCPT ); Wed, 24 Jul 2019 16:01:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:50838 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392295AbfGXUBo (ORCPT ); Wed, 24 Jul 2019 16:01:44 -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 D36BF205C9; Wed, 24 Jul 2019 20:01:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563998503; bh=Tiw9wrVuP8FVL6ODanQa3/r4I5xRYoyg/j0dQmxR1xY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GIf0eETtG1MTlchc9R2w8NjcBEm8jvuwdqIhtx9IkiifUwRY4BfS91vSOA7+ZMt2i 7hDxBEzGXC+jeJrEd3sGXQd6+KlT4J+SWR9jVunKCSRVAKdiK8MsqyRrMWtd91hXdy GvWCx7P4HsfTJhjnqsAXX/Svlgm+bZYD296FKKQk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe Leroy , =?UTF-8?q?Horia=20Geant=C4=83?= , Herbert Xu , Sasha Levin Subject: [PATCH 4.19 017/271] crypto: talitos - fix skcipher failure due to wrong output IV Date: Wed, 24 Jul 2019 21:18:06 +0200 Message-Id: <20190724191656.726984666@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191655.268628197@linuxfoundation.org> References: <20190724191655.268628197@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ 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 5849075d54c7..d46f58c13433 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -1553,11 +1553,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