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=ham 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 C990FC2BB55 for ; Thu, 16 Apr 2020 15:53:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A153720732 for ; Thu, 16 Apr 2020 15:53:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587052432; bh=cq4mKeRnHnlsgDMbjpf5DmyHS/UQgAcbFh62M2D5pXU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JZw19MOo6UoBGhSNj0rrqYrFAJpXvzizlZtEVjWHM/FuF9U6p4RIey7luukL8UXif Z/wBSGxlnG74DO/rGgJPyOOw3TYHfKh/zWXsuXsProWjYA2McEcIPct00kJHU8XFHi gPZSZLva4h5ewOa4oEByBFnA8PvRZ+mwIDt38Lkc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2506705AbgDPPxv (ORCPT ); Thu, 16 Apr 2020 11:53:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:41870 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2896542AbgDPNcs (ORCPT ); Thu, 16 Apr 2020 09:32:48 -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 9F7B9221F7; Thu, 16 Apr 2020 13:31:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587043881; bh=cq4mKeRnHnlsgDMbjpf5DmyHS/UQgAcbFh62M2D5pXU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hPuyIiazfxbN7yfu34h6lPPbQY4WgsOVpXwxSRpy4/FmiknNKpIaE0STa7tgfaiIN 4mCl+sg9ClnBkALqjL23oYxYZZ7nbO/qnJihgzre7s0AFVPRqseI6N8GFpVhV7VG7u 0LJMVvs9ZyQN5sub3iNMq/i9oCW5yycnjC7U0rJw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Gilad Ben-Yossef , Geert Uytterhoeven , Herbert Xu , Sasha Levin Subject: [PATCH 4.19 138/146] crypto: ccree - dec auth tag size from cryptlen map Date: Thu, 16 Apr 2020 15:24:39 +0200 Message-Id: <20200416131301.253367669@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200416131242.353444678@linuxfoundation.org> References: <20200416131242.353444678@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 From: Gilad Ben-Yossef [ Upstream commit 8962c6d2c2b8ca51b0f188109015b15fc5f4da44 ] Remove the auth tag size from cryptlen before mapping the destination in out-of-place AEAD decryption thus resolving a crash with extended testmgr tests. Signed-off-by: Gilad Ben-Yossef Reported-by: Geert Uytterhoeven Cc: stable@vger.kernel.org # v4.19+ Tested-by: Geert Uytterhoeven Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/ccree/cc_buffer_mgr.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/ccree/cc_buffer_mgr.c b/drivers/crypto/ccree/cc_buffer_mgr.c index 6681d113c0d67..77e31191e408a 100644 --- a/drivers/crypto/ccree/cc_buffer_mgr.c +++ b/drivers/crypto/ccree/cc_buffer_mgr.c @@ -1021,8 +1021,12 @@ static int cc_aead_chain_data(struct cc_drvdata *drvdata, if (req->src != req->dst) { size_for_map = areq_ctx->assoclen + req->cryptlen; - size_for_map += (direct == DRV_CRYPTO_DIRECTION_ENCRYPT) ? - authsize : 0; + + if (direct == DRV_CRYPTO_DIRECTION_ENCRYPT) + size_for_map += authsize; + else + size_for_map -= authsize; + if (is_gcm4543) size_for_map += crypto_aead_ivsize(tfm); -- 2.20.1