Skip to contentSkip to conversation

fscrypt: remove CRYPTO_CTR dependency

PATCH Applied Eric Biggers 3 participants 4 messages Sep 5, 2018 – Dec 12, 2018

Subsystems (2)
lore
Share & tools
lore

Eric Biggers

author maintainer
#0 lore raw

PATCH 1/1 fscrypt: remove CRYPTO_CTR dependency

From: Eric Biggers <[email protected]>

fscrypt doesn't use the CTR mode of operation for anything, so there's no need to select CRYPTO_CTR. It was added by commit 71dea01ea2ed ("ext4 crypto: require CONFIG_CRYPTO_CTR if ext4 encryption is enabled"). But, I've been unable to identify the arm64 crypto bug it was supposedly working around.

I suspect the issue was seen only on some old Android device kernel (circa 3.10?). So if the fix wasn't mistaken, the real bug is probably already fixed. Or maybe it was actually a bug in a non-upstream crypto driver.

So, remove the dependency. If it turns out there's actually still a bug, we'll fix it properly.

---
 fs/crypto/Kconfig | 1 -
 1 file changed, 1 deletion(-)
fs/crypto/Kconfig +0 -1
index 02b7d91c92310..284b589b4774d 100644
@@ -6,7 +6,6 @@ config FS_ENCRYPTION
 	select CRYPTO_ECB
 	select CRYPTO_XTS
 	select CRYPTO_CTS
-	select CRYPTO_CTR
 	select CRYPTO_SHA256
 	select KEYS
 	help
Signature · 1 line
2.19.0.rc2.392.g5ba43deb5a-goog
Acked-by on v1 1/1
#1 lore raw
Quoted 13 lines · Eric Biggers

From: Eric Biggers <[email protected]>

fscrypt doesn't use the CTR mode of operation for anything, so there's no need to select CRYPTO_CTR. It was added by commit 71dea01ea2ed ("ext4 crypto: require CONFIG_CRYPTO_CTR if ext4 encryption is enabled"). But, I've been unable to identify the arm64 crypto bug it was supposedly working around.

I suspect the issue was seen only on some old Android device kernel (circa 3.10?). So if the fix wasn't mistaken, the real bug is probably already fixed. Or maybe it was actually a bug in a non-upstream crypto driver.

Quoted 4 lines

So, remove the dependency. If it turns out there's actually still a bug, we'll fix it properly.

This may be related to

11e3b725cfc2 crypto: arm64/aes-blk - honour iv_out requirement in CBC and CTR modes

given that the commit in question mentions CTS. How it actually works around the issue is unclear to me, though.

Quoted 19 lines
---
 fs/crypto/Kconfig | 1 -
 1 file changed, 1 deletion(-)
fs/crypto/Kconfig +0 -2
index 02b7d91c92310..284b589b4774d 100644
@@ -6,7 +6,6 @@ config FS_ENCRYPTION
        select CRYPTO_ECB
        select CRYPTO_XTS
        select CRYPTO_CTS
-       select CRYPTO_CTR
        select CRYPTO_SHA256
        select KEYS
        help
--

2.19.0.rc2.392.g5ba43deb5a-goog

author maintainer
#2 lore raw
Quoted 36 lines · Ard Biesheuvel
Quoted 13 lines · Eric Biggers

From: Eric Biggers <[email protected]>

fscrypt doesn't use the CTR mode of operation for anything, so there's no need to select CRYPTO_CTR. It was added by commit 71dea01ea2ed ("ext4 crypto: require CONFIG_CRYPTO_CTR if ext4 encryption is enabled"). But, I've been unable to identify the arm64 crypto bug it was supposedly working around.

I suspect the issue was seen only on some old Android device kernel (circa 3.10?). So if the fix wasn't mistaken, the real bug is probably already fixed. Or maybe it was actually a bug in a non-upstream crypto driver.

Quoted 4 lines

So, remove the dependency. If it turns out there's actually still a bug, we'll fix it properly.

This may be related to

11e3b725cfc2 crypto: arm64/aes-blk - honour iv_out requirement in CBC and CTR modes

given that the commit in question mentions CTS. How it actually works around the issue is unclear to me, though.

Quoted 4 lines
---
 fs/crypto/Kconfig | 1 -
 1 file changed, 1 deletion(-)
Quoted 15 lines
Quoted 13 lines
fs/crypto/Kconfig +0 -2
index 02b7d91c92310..284b589b4774d 100644
@@ -6,7 +6,6 @@ config FS_ENCRYPTION
        select CRYPTO_ECB
        select CRYPTO_XTS
        select CRYPTO_CTS
-       select CRYPTO_CTR
        select CRYPTO_SHA256
        select KEYS
        help
--
Quoted 2 lines

2.19.0.rc2.392.g5ba43deb5a-goog

Ping. Ted, can you consider applying this to the fscrypt tree for 4.21?

Thanks,

- Eric

maintainer Applied
#3 lore raw
Quoted 15 lines · Eric Biggers
Quoted 14 lines · Ard Biesheuvel
Quoted 13 lines · Eric Biggers

From: Eric Biggers <[email protected]>

fscrypt doesn't use the CTR mode of operation for anything, so there's no need to select CRYPTO_CTR. It was added by commit 71dea01ea2ed ("ext4 crypto: require CONFIG_CRYPTO_CTR if ext4 encryption is enabled"). But, I've been unable to identify the arm64 crypto bug it was supposedly working around.

I suspect the issue was seen only on some old Android device kernel (circa 3.10?). So if the fix wasn't mistaken, the real bug is probably already fixed. Or maybe it was actually a bug in a non-upstream crypto driver.

Quoted 6 lines
Quoted 6 lines
Quoted 4 lines

So, remove the dependency. If it turns out there's actually still a bug, we'll fix it properly.

Thanks, applied.

- Ted