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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 71AD3C2BB55 for ; Thu, 16 Apr 2020 14:41:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3F89D21D7E for ; Thu, 16 Apr 2020 14:41:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587048115; bh=cIOg4crpwTP9ciJe671gs1El4Wkf8mdK+l18SkpVrV8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1l6AE5crfYbMZPtxqaBkgLTKFMsTqely1qVXWIBFAz9LEFOi4kuRYJylV08+KgPSF HODKJJxIHv0vUs0/4fjazIORFPFjGJMRVhyA6Qneuvx+NPrJ16iZdAxNVPJ7hAYYjG QQtGg7VGNTKT5OdiJ3oMo8C7QRMz9gvKe7t3ZPqc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394469AbgDPOlw (ORCPT ); Thu, 16 Apr 2020 10:41:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:48278 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392726AbgDPOBC (ORCPT ); Thu, 16 Apr 2020 10:01:02 -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 BF9EC2078B; Thu, 16 Apr 2020 14:01:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587045662; bh=cIOg4crpwTP9ciJe671gs1El4Wkf8mdK+l18SkpVrV8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e2k12MC0AtQ5bzCfp0g1DRuOgXqWhcpIgHK1bveZ+q7FWxZw79YVaQI2oHD71JGt6 yQgmIX7Ukgyp2DD8jOyS9Q8FnzKjRM8Q1144yHbSuOlYzQ0bxq4U08Yj6VzvlCki8l 7poQur4DxEOJOLNhcqFoWAEp3pJ4jm6A6lT9ojCI= 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 Subject: [PATCH 5.6 187/254] crypto: ccree - dec auth tag size from cryptlen map Date: Thu, 16 Apr 2020 15:24:36 +0200 Message-Id: <20200416131349.731381817@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200416131325.804095985@linuxfoundation.org> References: <20200416131325.804095985@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 commit 8962c6d2c2b8ca51b0f188109015b15fc5f4da44 upstream. 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: Greg Kroah-Hartman --- drivers/crypto/ccree/cc_buffer_mgr.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/drivers/crypto/ccree/cc_buffer_mgr.c +++ b/drivers/crypto/ccree/cc_buffer_mgr.c @@ -894,8 +894,12 @@ static int cc_aead_chain_data(struct cc_ 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);