All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Axtens <dja@axtens.net>
To: omosnacek@gmail.com, linux-crypto@vger.kernel.org,
	Herbert Xu <herbert@gondor.apana.org.au>
Cc: marcelo.cerri@canonical.com,
	Stephan Mueller <smueller@chronox.de>,
	leo.barbosa@canonical.com, linuxppc-dev@lists.ozlabs.org,
	nayna@linux.ibm.com, pfsmorigo@gmail.com, leitao@debian.org
Subject: [PATCH] crypto: vmx - fix copy-paste error in CTR mode
Date: Fri, 15 Mar 2019 13:09:01 +1100	[thread overview]
Message-ID: <20190315020901.16509-1-dja@axtens.net> (raw)

The original assembly imported from OpenSSL has two copy-paste
errors in handling CTR mode. When dealing with a 2 or 3 block tail,
the code branches to the CBC decryption exit path, rather than to
the CTR exit path.

This leads to corruption of the IV, which leads to subsequent blocks
being corrupted.

This can be detected with libkcapi test suite, which is available at
https://github.com/smuellerDD/libkcapi

Reported-by: Ondrej Mosnáček <omosnacek@gmail.com>
Fixes: 5c380d623ed3 ("crypto: vmx - Add support for VMS instructions by ASM")
Cc: stable@vger.kernel.org
Signed-off-by: Daniel Axtens <dja@axtens.net>
---
 drivers/crypto/vmx/aesp8-ppc.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/vmx/aesp8-ppc.pl b/drivers/crypto/vmx/aesp8-ppc.pl
index d6a9f63d65ba..de78282b8f44 100644
--- a/drivers/crypto/vmx/aesp8-ppc.pl
+++ b/drivers/crypto/vmx/aesp8-ppc.pl
@@ -1854,7 +1854,7 @@ Lctr32_enc8x_three:
 	stvx_u		$out1,$x10,$out
 	stvx_u		$out2,$x20,$out
 	addi		$out,$out,0x30
-	b		Lcbc_dec8x_done
+	b		Lctr32_enc8x_done
 
 .align	5
 Lctr32_enc8x_two:
@@ -1866,7 +1866,7 @@ Lctr32_enc8x_two:
 	stvx_u		$out0,$x00,$out
 	stvx_u		$out1,$x10,$out
 	addi		$out,$out,0x20
-	b		Lcbc_dec8x_done
+	b		Lctr32_enc8x_done
 
 .align	5
 Lctr32_enc8x_one:
-- 
2.19.1


WARNING: multiple messages have this Message-ID (diff)
From: Daniel Axtens <dja@axtens.net>
To: omosnacek@gmail.com, linux-crypto@vger.kernel.org,
	Herbert Xu <herbert@gondor.apana.org.au>
Cc: leo.barbosa@canonical.com, Stephan Mueller <smueller@chronox.de>,
	nayna@linux.ibm.com, leitao@debian.org, pfsmorigo@gmail.com,
	marcelo.cerri@canonical.com, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH] crypto: vmx - fix copy-paste error in CTR mode
Date: Fri, 15 Mar 2019 13:09:01 +1100	[thread overview]
Message-ID: <20190315020901.16509-1-dja@axtens.net> (raw)

The original assembly imported from OpenSSL has two copy-paste
errors in handling CTR mode. When dealing with a 2 or 3 block tail,
the code branches to the CBC decryption exit path, rather than to
the CTR exit path.

This leads to corruption of the IV, which leads to subsequent blocks
being corrupted.

This can be detected with libkcapi test suite, which is available at
https://github.com/smuellerDD/libkcapi

Reported-by: Ondrej Mosnáček <omosnacek@gmail.com>
Fixes: 5c380d623ed3 ("crypto: vmx - Add support for VMS instructions by ASM")
Cc: stable@vger.kernel.org
Signed-off-by: Daniel Axtens <dja@axtens.net>
---
 drivers/crypto/vmx/aesp8-ppc.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/vmx/aesp8-ppc.pl b/drivers/crypto/vmx/aesp8-ppc.pl
index d6a9f63d65ba..de78282b8f44 100644
--- a/drivers/crypto/vmx/aesp8-ppc.pl
+++ b/drivers/crypto/vmx/aesp8-ppc.pl
@@ -1854,7 +1854,7 @@ Lctr32_enc8x_three:
 	stvx_u		$out1,$x10,$out
 	stvx_u		$out2,$x20,$out
 	addi		$out,$out,0x30
-	b		Lcbc_dec8x_done
+	b		Lctr32_enc8x_done
 
 .align	5
 Lctr32_enc8x_two:
@@ -1866,7 +1866,7 @@ Lctr32_enc8x_two:
 	stvx_u		$out0,$x00,$out
 	stvx_u		$out1,$x10,$out
 	addi		$out,$out,0x20
-	b		Lcbc_dec8x_done
+	b		Lctr32_enc8x_done
 
 .align	5
 Lctr32_enc8x_one:
-- 
2.19.1


             reply	other threads:[~2019-03-15  2:09 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-15  2:09 Daniel Axtens [this message]
2019-03-15  2:09 ` [PATCH] crypto: vmx - fix copy-paste error in CTR mode Daniel Axtens
2019-03-15  2:24 ` Eric Biggers
2019-03-15  2:24   ` Eric Biggers
2019-03-15  4:24   ` Daniel Axtens
2019-03-15  4:24     ` Daniel Axtens
2019-03-15  4:34     ` Eric Biggers
2019-03-15  4:34       ` Eric Biggers
2019-03-15  5:23       ` Daniel Axtens
2019-03-15  5:23         ` Daniel Axtens
2019-04-10  7:02         ` Eric Biggers
2019-04-10  7:02           ` Eric Biggers
2019-04-11 14:47           ` Daniel Axtens
2019-04-11 14:47             ` Daniel Axtens
2019-04-11 17:40             ` Nayna
2019-04-11 17:40               ` Nayna
2019-04-13  3:41               ` Michael Ellerman
2019-04-13  3:41                 ` Michael Ellerman
2019-05-06 15:53                 ` Eric Biggers
2019-05-06 15:53                   ` Eric Biggers
2019-05-13  0:59                   ` Herbert Xu
2019-05-13  0:59                     ` Herbert Xu
2019-05-13 11:39                     ` Michael Ellerman
2019-05-13 11:39                       ` Michael Ellerman
2019-05-14 17:35                       ` Daniel Axtens
2019-05-14 17:35                         ` Daniel Axtens
2019-05-15  3:53                         ` Herbert Xu
2019-05-15  3:53                           ` Herbert Xu
2019-05-15  6:36                           ` Daniel Axtens
2019-05-15  6:36                             ` Daniel Axtens
2019-05-16  2:12                             ` Daniel Axtens
2019-05-16  2:12                               ` Daniel Axtens
2019-05-16  2:56                               ` Eric Biggers
2019-05-16  2:56                                 ` Eric Biggers
2019-05-16  5:28                                 ` Daniel Axtens
2019-05-16  5:28                                   ` Daniel Axtens
2019-03-18  8:41       ` Michael Ellerman
2019-03-18  8:41         ` Michael Ellerman
2019-03-18  9:13         ` Ard Biesheuvel
2019-03-18  9:13           ` Ard Biesheuvel
2019-03-19  0:52           ` Michael Ellerman
2019-03-19  0:52             ` Michael Ellerman
2019-03-18  6:03 ` Michael Ellerman
2019-03-18  6:03   ` Michael Ellerman
2019-03-20  8:40 ` Ondrej Mosnáček
2019-03-20  8:40   ` Ondrej Mosnáček
2019-03-22 13:04 ` Herbert Xu
2019-03-22 13:04   ` Herbert Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190315020901.16509-1-dja@axtens.net \
    --to=dja@axtens.net \
    --cc=herbert@gondor.apana.org.au \
    --cc=leitao@debian.org \
    --cc=leo.barbosa@canonical.com \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=marcelo.cerri@canonical.com \
    --cc=nayna@linux.ibm.com \
    --cc=omosnacek@gmail.com \
    --cc=pfsmorigo@gmail.com \
    --cc=smueller@chronox.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.