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,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 6C93FC352A3 for ; Mon, 10 Feb 2020 12:53:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 33E6B20708 for ; Mon, 10 Feb 2020 12:53:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581339181; bh=eORnYaaVgk1tB4klU3Jhd6OSbnxmgAiQcJcl2bSQH78=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=K4Q4tnQF4MjF8FxhGL/l7MW8p+AFTHzZZUMH8k1JWfZ2gQS4C08iLuiQx7frKLPfM IiKScQn4Tbz4PVXxKLb76EpGLH7cDA78mGMVrm9HKxGXHIw/um0NF331o6o2am2eQP NqAWu+mgIdaluSchNHrkRHgOGzuNutccbTVo3gHg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729384AbgBJMxA (ORCPT ); Mon, 10 Feb 2020 07:53:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:46368 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729933AbgBJMmQ (ORCPT ); Mon, 10 Feb 2020 07:42:16 -0500 Received: from localhost (unknown [209.37.97.194]) (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 3457720733; Mon, 10 Feb 2020 12:42:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338536; bh=eORnYaaVgk1tB4klU3Jhd6OSbnxmgAiQcJcl2bSQH78=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BIcJTY5TmJDekrRLA2CvYS7gX1qTRrn+rEl/fnmnHcBBDAcjT/Hi7CKcJ3iD5Oh2Q URornUJpooMKvNMsu1mo4bRwUkIGaSxDlJ6KMvuf2d1KVjk5LKXJLBo7nrHSCrklV0 wcF2hljy5pdidcd5iF3mzz/FOIeYA2ZIVN1Y4wsg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Tudor Ambarus , Herbert Xu , Sasha Levin Subject: [PATCH 5.5 364/367] crypto: atmel-aes - Fix CTR counter overflow when multiple fragments Date: Mon, 10 Feb 2020 04:34:37 -0800 Message-Id: <20200210122455.932626656@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200210122423.695146547@linuxfoundation.org> References: <20200210122423.695146547@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tudor Ambarus [ Upstream commit 3907ccfaec5d9965e306729936fc732c94d2c1e7 ] The CTR transfer works in fragments of data of maximum 1 MByte because of the 16 bit CTR counter embedded in the IP. Fix the CTR counter overflow handling for messages larger than 1 MByte. Reported-by: Dan Carpenter Fixes: 781a08d9740a ("crypto: atmel-aes - Fix counter overflow in CTR mode") Signed-off-by: Tudor Ambarus Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/atmel-aes.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/atmel-aes.c b/drivers/crypto/atmel-aes.c index ea9dcd7ce799b..b4dee726b2530 100644 --- a/drivers/crypto/atmel-aes.c +++ b/drivers/crypto/atmel-aes.c @@ -121,7 +121,7 @@ struct atmel_aes_ctr_ctx { size_t offset; struct scatterlist src[2]; struct scatterlist dst[2]; - u16 blocks; + u32 blocks; }; struct atmel_aes_gcm_ctx { @@ -528,6 +528,12 @@ static void atmel_aes_ctr_update_req_iv(struct atmel_aes_dev *dd) unsigned int ivsize = crypto_skcipher_ivsize(skcipher); int i; + /* + * The CTR transfer works in fragments of data of maximum 1 MByte + * because of the 16 bit CTR counter embedded in the IP. When reaching + * here, ctx->blocks contains the number of blocks of the last fragment + * processed, there is no need to explicit cast it to u16. + */ for (i = 0; i < ctx->blocks; i++) crypto_inc((u8 *)ctx->iv, AES_BLOCK_SIZE); -- 2.20.1