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=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 984E1C32753 for ; Wed, 14 Aug 2019 17:18:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 709B5206C2 for ; Wed, 14 Aug 2019 17:18:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565803121; bh=s6FgJYfNgOiYJdk98S53txAk4fmhvuTEHWOb5pEm2x8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mZk6bQ6TNTgskzhxJMtJCDwXfskVY7oFtpLJoF3Um/34np6Ye9UEq6MuFaE9gy5qe jBRAoUR8UuHf8AT4r7WdvgYSYus2o3+cXH3pRpZ8x/3jAdabH8oIvInvfDwbSHjAi5 PRNFdxNXQOI0BkGZ82iFTn0LqbYxpSYlHDkb4Rfg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730325AbfHNRMe (ORCPT ); Wed, 14 Aug 2019 13:12:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:36464 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730332AbfHNRMe (ORCPT ); Wed, 14 Aug 2019 13:12:34 -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 858812084D; Wed, 14 Aug 2019 17:12:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565802754; bh=s6FgJYfNgOiYJdk98S53txAk4fmhvuTEHWOb5pEm2x8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gbxcTkGT24C47ZAy/LOarh2ZNh6ukCccbfq6ECchURVxYtA82YwP2BMAwSXbW2lbC o6lCvyx7c2wS2fHe0+3+sO3rCvdPKi8ishRnEElLNheQrJCt62qwN1MnvXhCNnSWKW guNx8rZVYl8OKlH+sCJWwnRTDKpCWyNoFIEHiecw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Gary R Hook , Herbert Xu Subject: [PATCH 4.14 03/69] crypto: ccp - Ignore tag length when decrypting GCM ciphertext Date: Wed, 14 Aug 2019 19:01:01 +0200 Message-Id: <20190814165745.372646143@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190814165744.822314328@linuxfoundation.org> References: <20190814165744.822314328@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: Gary R Hook commit e2664ecbb2f26225ac6646876f2899558ffb2604 upstream. AES GCM input buffers for decryption contain AAD+CTEXT+TAG. Only decrypt the ciphertext, and use the tag for comparison. Fixes: 36cf515b9bbe2 ("crypto: ccp - Enable support for AES GCM on v5 CCPs") Cc: Signed-off-by: Gary R Hook Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- drivers/crypto/ccp/ccp-ops.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/crypto/ccp/ccp-ops.c +++ b/drivers/crypto/ccp/ccp-ops.c @@ -752,8 +752,7 @@ static int ccp_run_aes_gcm_cmd(struct cc while (src.sg_wa.bytes_left) { ccp_prepare_data(&src, &dst, &op, AES_BLOCK_SIZE, true); if (!src.sg_wa.bytes_left) { - unsigned int nbytes = aes->src_len - % AES_BLOCK_SIZE; + unsigned int nbytes = ilen % AES_BLOCK_SIZE; if (nbytes) { op.eom = 1;