| Message ID | 20171208013838.105034-1-ebiggers3@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Herbert Xu |
| Headers | show |
Hi Eric, Nice to see more use of ChaCha20. However... Can we skip over the "sort of worse than XTS, but not having _real_ authentication sucks anyway in either case, so whatever" and move directly to, "linux finally supports authenticated encryption for disk encryption!"? This would be a big deal and would actually be a noticeable security improvement, instead of a potentially dubious step sidewaysbackish. Bcachefs supports ChaCha20Poly1305, which is pretty neat. From what I've read, performance is acceptable too. http://bcachefs.org/Encryption/ Jason
On 8 December 2017 at 02:51, Jason A. Donenfeld <Jason@zx2c4.com> wrote: > Hi Eric, > > Nice to see more use of ChaCha20. However... > > Can we skip over the "sort of worse than XTS, but not having _real_ > authentication sucks anyway in either case, so whatever" and move > directly to, "linux finally supports authenticated encryption for disk > encryption!"? Ehm, it doesn't? This is plain ChaCha20, not any AEAD variant. > This would be a big deal and would actually be a > noticeable security improvement, instead of a potentially dubious step > sidewaysbackish. > It is actually dubious, given the large scale reuse of IVs with a stream cipher. I do suppose though that using an AEAD variant would at least catch any attacks involving flipping ciphertext bits resulting in plaintext bits being flipped at the same offset (but file updates would still be visible in the clear) > Bcachefs supports ChaCha20Poly1305, which is pretty neat. From what > I've read, performance is acceptable too. > http://bcachefs.org/Encryption/ > > Jason
Hi Eric, On 8 December 2017 at 01:38, Eric Biggers <ebiggers3@gmail.com> wrote: > From: Eric Biggers <ebiggers@google.com> > > fscrypt currently only supports AES encryption. However, many low-end > mobile devices still use older CPUs such as ARMv7, which do not support > the AES instructions (the ARMv8 Cryptography Extensions). This results > in very poor AES performance, even if the NEON bit-sliced implementation > is used. Roughly 20-40 MB/s is a typical number, in comparison to > 300-800 MB/s on CPUs that support the AES instructions. Switching from > AES-256 to AES-128 only helps by about 30%. > > The result is that vendors don't enable encryption on these devices, > leaving users unprotected. > > A performance difference of similar magnitude can also be observed on > x86, between CPUs with and without the AES-NI instruction set. > > This patch provides an alternative to AES by updating fscrypt to support > the ChaCha20 stream cipher (RFC7539) for contents encryption. ChaCha20 > was designed to have a large security margin, to be efficient on > general-purpose CPUs without dedicated instructions, and to be > vectorizable. It is already supported by the Linux crypto API, > including a vectorized implementation for ARM using NEON instructions, > and vectorized implementations for x86 using SSSE3 or AVX2 instructions. > > On 32-bit ARM processors with NEON support, ChaCha20 is about 3.2 times > faster than AES-128-XTS (chacha20-neon vs. xts-aes-neonbs). Without > NEON support, ChaCha20 is about 1.5 times as fast (chacha20-generic vs. > xts(aes-asm)). The improvement over AES-256-XTS is even greater. > > Note that stream ciphers are not an ideal choice for disk encryption, > since each data block has to be encrypted with the same IV each time it > is overwritten. Consequently, an adversary who observes the ciphertext > both before and after a write can trivially recover the keystream if > they can guess one of the plaintexts. Moreover, an adversary who can > write to the ciphertext can flip arbitrary bits in the plaintext, merely > by flipping the corresponding bits in the ciphertext. A block cipher > operating in the XTS or CBC-ESSIV mode provides some protection against > these types of attacks -- albeit not full protection, which would at > minimum require the use an authenticated encryption mode with nonces. > > Unfortunately, we are unaware of any block cipher which performs as well > as ChaCha20, has a similar or greater security margin, and has been > subject to as much public security analysis. We do not consider Speck > to be a viable alternative at this time. > > Still, a stream cipher is sufficient to protect data confidentiality in > the event of a single point-in-time permanent offline compromise of the > disk, which currently is the primary threat model for fscrypt. Thus, > when the alternative is quite literally *no encryption*, we might as > well use a stream cipher. > > We offer ChaCha20 rather than the reduced-round variants ChaCha8 or > ChaCha12 because ChaCha20 has a much higher security margin, and we are > primarily targeting CPUs where ChaCha20 is fast enough, in particular > CPUs that have vector instructions such as NEON or SSSE3. Also, the > crypto API currently only supports ChaCha20. Still, if ChaCha8 and/or > ChaCha12 support were to be added to the crypto API, it would be > straightforward to support them in fscrypt too. > > Currently, stream ciphers cannot be used for filenames encryption with > fscrypt because all filenames in a directory have to be encrypted with > the same IV. Therefore, we offer ChaCha20 for contents encryption only. > Filenames encryption still must use AES-256-CTS-CBC. This is acceptable > because filenames encryption is not as performance-critical as contents > encryption. > > Reviewed-by: Michael Halcrow <mhalcrow@google.com> > Signed-off-by: Eric Biggers <ebiggers@google.com> > --- > Documentation/filesystems/fscrypt.rst | 43 +++++++++++++++++++--- > fs/crypto/Kconfig | 1 + > fs/crypto/crypto.c | 69 ++++++++++++++++++++++++++++------- > fs/crypto/keyinfo.c | 2 + > include/linux/fscrypt.h | 6 ++- > include/uapi/linux/fs.h | 1 + > 6 files changed, 102 insertions(+), 20 deletions(-) > > diff --git a/Documentation/filesystems/fscrypt.rst b/Documentation/filesystems/fscrypt.rst > index 776ddc655f79..927d3c88816b 100644 > --- a/Documentation/filesystems/fscrypt.rst > +++ b/Documentation/filesystems/fscrypt.rst > @@ -184,6 +184,9 @@ replaced with HKDF or another more standard KDF in the future. > Encryption modes and usage > ========================== > > +Available modes > +--------------- > + > fscrypt allows one encryption mode to be specified for file contents > and one encryption mode to be specified for filenames. Different > directory trees are permitted to use different encryption modes. > @@ -191,24 +194,52 @@ Currently, the following pairs of encryption modes are supported: > > - AES-256-XTS for contents and AES-256-CTS-CBC for filenames > - AES-128-CBC for contents and AES-128-CTS-CBC for filenames > +- ChaCha20 for contents and AES-256-CTS-CBC for filenames > > It is strongly recommended to use AES-256-XTS for contents encryption. > AES-128-CBC was added only for low-powered embedded devices with > crypto accelerators such as CAAM or CESA that do not support XTS. > > +Similarly, ChaCha20 was only added for low-end devices that have > +neither a CPU with AES instructions, nor a hardware crypto > +accelerator. Note that since ChaCha20 is a stream cipher, it is > +easily broken if an attacker can view encrypted data both before and > +after it is overwritten. Thus, even moreso than the other modes, > +ChaCha20 can protect data confidentiality *only* in the event of a > +single point-in-time, permanent offline compromise of the storage. > +Also, ChaCha20 is supported only for contents encryption, not > +filenames encryption, because all filenames in a directory have to be > +encrypted with the same IV, which would be especially inappropriate > +for a stream cipher. > + > New encryption modes can be added relatively easily, without changes > to individual filesystems. However, authenticated encryption (AE) > modes are not currently supported because of the difficulty of dealing > with ciphertext expansion. > > +Contents encryption > +------------------- > + > For file contents, each filesystem block is encrypted independently. > Currently, only the case where the filesystem block size is equal to > -the system's page size (usually 4096 bytes) is supported. With the > -XTS mode of operation (recommended), the logical block number within > -the file is used as the IV. With the CBC mode of operation (not > -recommended), ESSIV is used; specifically, the IV for CBC is the > -logical block number encrypted with AES-256, where the AES-256 key is > -the SHA-256 hash of the inode's data encryption key. > +the system's page size (usually 4096 bytes) is supported. > + > +With the XTS mode of operation, the logical block number within the > +file is used as the IV. > + > +With the CBC mode of operation, ESSIV is used. Specifically, the IV > +is the file logical block number encrypted with AES-256, where the > +AES-256 key is the SHA-256 hash of the inode's data encryption key. > + > +With ChaCha20, the file logical block number is also used as the IV, > +but it is formatted differently to ensure that it is copied into the > +"nonce" portion of the ChaCha20 initial state (words 14-15) rather > +than the "block counter" portion (words 12-13). This detail is > +critical, since otherwise different portions of the file would be > +encrypted with the same keystream. > + > +Filenames encryption > +-------------------- > > For filenames, the full filename is encrypted at once. Because of the > requirements to retain support for efficient directory lookups and > diff --git a/fs/crypto/Kconfig b/fs/crypto/Kconfig > index 02b7d91c9231..44f052e9d842 100644 > --- a/fs/crypto/Kconfig > +++ b/fs/crypto/Kconfig > @@ -3,6 +3,7 @@ config FS_ENCRYPTION > select CRYPTO > select CRYPTO_AES > select CRYPTO_CBC > + select CRYPTO_CHACHA20 > select CRYPTO_ECB > select CRYPTO_XTS > select CRYPTO_CTS > diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c > index 732a786cce9d..d5c95a18db59 100644 > --- a/fs/crypto/crypto.c > +++ b/fs/crypto/crypto.c > @@ -126,15 +126,66 @@ struct fscrypt_ctx *fscrypt_get_ctx(const struct inode *inode, gfp_t gfp_flags) > } > EXPORT_SYMBOL(fscrypt_get_ctx); > > +struct fscrypt_iv { > + __le64 first_half; > + __le64 second_half; > +}; > + > +/* > + * Generate the IV for encrypting/decrypting the block at the given logical > + * block number within a file. > + */ > +static void fscrypt_generate_iv(struct fscrypt_iv *iv, u64 lblk_num, > + const struct fscrypt_info *ci) > +{ > + BUILD_BUG_ON(sizeof(*iv) != FS_IV_SIZE); > + > + if (ci->ci_data_mode == FS_ENCRYPTION_MODE_CHACHA20) { > + /* > + * ChaCha20 interprets its IV as a block counter followed by a > + * nonce. We *MUST NOT* use the file logical block number as > + * the Chacha block counter because the ChaCha block counter > + * counts 64-byte ChaCha blocks, which are much smaller than > + * file blocks. If we did, then portions of the keystream would > + * be repeated, which would be catastrophic. > + * OK, so you are saying that LBA n + 1 will share its keystream with LBA n but shift by 64 blocks, right? Yeah, that's terrible. But I severely dislike having to make the fscrypt code intimately aware of this. Why can't we just encrypt the IV like we do for AES-CBC? We already pull in that code for the filenames anyway. Alternatively, we could have a IV mangling wrapper around chacha20 that moves this special handling out of fscrypt. > + * We could initialize the block counter with the offset in the > + * file in ChaCha blocks. But RFC7539 defines the ChaCha20 > + * block counter to be 32-bit, which is only enough for a 256GiB > + * keystream. Confusingly, this differs from the original > + * ChaCha paper which defines the block counter to be 64-bit. > + * > + * To be compatible with either convention, just put the file > + * logical block number in the second half of the IV, so that it > + * goes into the "nonce" portion of the ChaCha initial state > + * (words 14-15). The ChaCha block counter then starts at 0 for > + * each file block. In other words, we use one keystream per > + * file block instead of one keystream per file. > + */ > + iv->first_half = 0; > + iv->second_half = cpu_to_le64(lblk_num); > + > + BUG_ON(ci->ci_essiv_tfm != NULL); > + } else { > + /* XTS or CBC */ > + iv->first_half = cpu_to_le64(lblk_num); > + iv->second_half = 0; > + > + if (ci->ci_essiv_tfm != NULL) { > + /* CBC */ > + BUILD_BUG_ON(AES_BLOCK_SIZE != FS_IV_SIZE); > + crypto_cipher_encrypt_one(ci->ci_essiv_tfm, > + (u8 *)iv, (u8 *)iv); > + } > + } > +} > + > int fscrypt_do_page_crypto(const struct inode *inode, fscrypt_direction_t rw, > u64 lblk_num, struct page *src_page, > struct page *dest_page, unsigned int len, > unsigned int offs, gfp_t gfp_flags) > { > - struct { > - __le64 index; > - u8 padding[FS_IV_SIZE - sizeof(__le64)]; > - } iv; > + struct fscrypt_iv iv; > struct skcipher_request *req = NULL; > DECLARE_CRYPTO_WAIT(wait); > struct scatterlist dst, src; > @@ -144,15 +195,7 @@ int fscrypt_do_page_crypto(const struct inode *inode, fscrypt_direction_t rw, > > BUG_ON(len == 0); > > - BUILD_BUG_ON(sizeof(iv) != FS_IV_SIZE); > - BUILD_BUG_ON(AES_BLOCK_SIZE != FS_IV_SIZE); > - iv.index = cpu_to_le64(lblk_num); > - memset(iv.padding, 0, sizeof(iv.padding)); > - > - if (ci->ci_essiv_tfm != NULL) { > - crypto_cipher_encrypt_one(ci->ci_essiv_tfm, (u8 *)&iv, > - (u8 *)&iv); > - } > + fscrypt_generate_iv(&iv, lblk_num, ci); > > req = skcipher_request_alloc(tfm, gfp_flags); > if (!req) { > diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c > index 5e6e846f5a24..bae4cce2389a 100644 > --- a/fs/crypto/keyinfo.c > +++ b/fs/crypto/keyinfo.c > @@ -13,6 +13,7 @@ > #include <linux/scatterlist.h> > #include <linux/ratelimit.h> > #include <crypto/aes.h> > +#include <crypto/chacha20.h> > #include <crypto/sha.h> > #include "fscrypt_private.h" > > @@ -134,6 +135,7 @@ static const struct { > FS_AES_128_CBC_KEY_SIZE }, > [FS_ENCRYPTION_MODE_AES_128_CTS] = { "cts(cbc(aes))", > FS_AES_128_CTS_KEY_SIZE }, > + [FS_ENCRYPTION_MODE_CHACHA20] = { "chacha20", CHACHA20_KEY_SIZE }, > }; > > static int determine_cipher_type(struct fscrypt_info *ci, struct inode *inode, > diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h > index 08b4b40c5aa8..1cfb7950f915 100644 > --- a/include/linux/fscrypt.h > +++ b/include/linux/fscrypt.h > @@ -100,11 +100,15 @@ static inline bool fscrypt_dummy_context_enabled(struct inode *inode) > static inline bool fscrypt_valid_enc_modes(u32 contents_mode, > u32 filenames_mode) > { > + if (contents_mode == FS_ENCRYPTION_MODE_AES_256_XTS && > + filenames_mode == FS_ENCRYPTION_MODE_AES_256_CTS) > + return true; > + > if (contents_mode == FS_ENCRYPTION_MODE_AES_128_CBC && > filenames_mode == FS_ENCRYPTION_MODE_AES_128_CTS) > return true; > > - if (contents_mode == FS_ENCRYPTION_MODE_AES_256_XTS && > + if (contents_mode == FS_ENCRYPTION_MODE_CHACHA20 && > filenames_mode == FS_ENCRYPTION_MODE_AES_256_CTS) > return true; > > diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h > index 4199f8acbce5..5a25eb2994b1 100644 > --- a/include/uapi/linux/fs.h > +++ b/include/uapi/linux/fs.h > @@ -275,6 +275,7 @@ struct fsxattr { > #define FS_ENCRYPTION_MODE_AES_256_CTS 4 > #define FS_ENCRYPTION_MODE_AES_128_CBC 5 > #define FS_ENCRYPTION_MODE_AES_128_CTS 6 > +#define FS_ENCRYPTION_MODE_CHACHA20 7 > > struct fscrypt_policy { > __u8 version; > -- > 2.15.1.424.g9478a66081-goog >
On 8 December 2017 at 09:11, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote: > Hi Eric, > > On 8 December 2017 at 01:38, Eric Biggers <ebiggers3@gmail.com> wrote: >> From: Eric Biggers <ebiggers@google.com> >> >> fscrypt currently only supports AES encryption. However, many low-end >> mobile devices still use older CPUs such as ARMv7, which do not support >> the AES instructions (the ARMv8 Cryptography Extensions). This results >> in very poor AES performance, even if the NEON bit-sliced implementation >> is used. Roughly 20-40 MB/s is a typical number, in comparison to >> 300-800 MB/s on CPUs that support the AES instructions. Switching from >> AES-256 to AES-128 only helps by about 30%. >> >> The result is that vendors don't enable encryption on these devices, >> leaving users unprotected. >> >> A performance difference of similar magnitude can also be observed on >> x86, between CPUs with and without the AES-NI instruction set. >> >> This patch provides an alternative to AES by updating fscrypt to support >> the ChaCha20 stream cipher (RFC7539) for contents encryption. ChaCha20 >> was designed to have a large security margin, to be efficient on >> general-purpose CPUs without dedicated instructions, and to be >> vectorizable. It is already supported by the Linux crypto API, >> including a vectorized implementation for ARM using NEON instructions, >> and vectorized implementations for x86 using SSSE3 or AVX2 instructions. >> >> On 32-bit ARM processors with NEON support, ChaCha20 is about 3.2 times >> faster than AES-128-XTS (chacha20-neon vs. xts-aes-neonbs). Without >> NEON support, ChaCha20 is about 1.5 times as fast (chacha20-generic vs. >> xts(aes-asm)). The improvement over AES-256-XTS is even greater. >> >> Note that stream ciphers are not an ideal choice for disk encryption, >> since each data block has to be encrypted with the same IV each time it >> is overwritten. Consequently, an adversary who observes the ciphertext >> both before and after a write can trivially recover the keystream if >> they can guess one of the plaintexts. Moreover, an adversary who can >> write to the ciphertext can flip arbitrary bits in the plaintext, merely >> by flipping the corresponding bits in the ciphertext. A block cipher >> operating in the XTS or CBC-ESSIV mode provides some protection against >> these types of attacks -- albeit not full protection, which would at >> minimum require the use an authenticated encryption mode with nonces. >> >> Unfortunately, we are unaware of any block cipher which performs as well >> as ChaCha20, has a similar or greater security margin, and has been >> subject to as much public security analysis. We do not consider Speck >> to be a viable alternative at this time. >> >> Still, a stream cipher is sufficient to protect data confidentiality in >> the event of a single point-in-time permanent offline compromise of the >> disk, which currently is the primary threat model for fscrypt. Thus, >> when the alternative is quite literally *no encryption*, we might as >> well use a stream cipher. >> >> We offer ChaCha20 rather than the reduced-round variants ChaCha8 or >> ChaCha12 because ChaCha20 has a much higher security margin, and we are >> primarily targeting CPUs where ChaCha20 is fast enough, in particular >> CPUs that have vector instructions such as NEON or SSSE3. Also, the >> crypto API currently only supports ChaCha20. Still, if ChaCha8 and/or >> ChaCha12 support were to be added to the crypto API, it would be >> straightforward to support them in fscrypt too. >> >> Currently, stream ciphers cannot be used for filenames encryption with >> fscrypt because all filenames in a directory have to be encrypted with >> the same IV. Therefore, we offer ChaCha20 for contents encryption only. >> Filenames encryption still must use AES-256-CTS-CBC. This is acceptable >> because filenames encryption is not as performance-critical as contents >> encryption. >> >> Reviewed-by: Michael Halcrow <mhalcrow@google.com> >> Signed-off-by: Eric Biggers <ebiggers@google.com> >> --- >> Documentation/filesystems/fscrypt.rst | 43 +++++++++++++++++++--- >> fs/crypto/Kconfig | 1 + >> fs/crypto/crypto.c | 69 ++++++++++++++++++++++++++++------- >> fs/crypto/keyinfo.c | 2 + >> include/linux/fscrypt.h | 6 ++- >> include/uapi/linux/fs.h | 1 + >> 6 files changed, 102 insertions(+), 20 deletions(-) >> >> diff --git a/Documentation/filesystems/fscrypt.rst b/Documentation/filesystems/fscrypt.rst >> index 776ddc655f79..927d3c88816b 100644 >> --- a/Documentation/filesystems/fscrypt.rst >> +++ b/Documentation/filesystems/fscrypt.rst >> @@ -184,6 +184,9 @@ replaced with HKDF or another more standard KDF in the future. >> Encryption modes and usage >> ========================== >> >> +Available modes >> +--------------- >> + >> fscrypt allows one encryption mode to be specified for file contents >> and one encryption mode to be specified for filenames. Different >> directory trees are permitted to use different encryption modes. >> @@ -191,24 +194,52 @@ Currently, the following pairs of encryption modes are supported: >> >> - AES-256-XTS for contents and AES-256-CTS-CBC for filenames >> - AES-128-CBC for contents and AES-128-CTS-CBC for filenames >> +- ChaCha20 for contents and AES-256-CTS-CBC for filenames >> >> It is strongly recommended to use AES-256-XTS for contents encryption. >> AES-128-CBC was added only for low-powered embedded devices with >> crypto accelerators such as CAAM or CESA that do not support XTS. >> >> +Similarly, ChaCha20 was only added for low-end devices that have >> +neither a CPU with AES instructions, nor a hardware crypto >> +accelerator. Note that since ChaCha20 is a stream cipher, it is >> +easily broken if an attacker can view encrypted data both before and >> +after it is overwritten. Thus, even moreso than the other modes, >> +ChaCha20 can protect data confidentiality *only* in the event of a >> +single point-in-time, permanent offline compromise of the storage. >> +Also, ChaCha20 is supported only for contents encryption, not >> +filenames encryption, because all filenames in a directory have to be >> +encrypted with the same IV, which would be especially inappropriate >> +for a stream cipher. >> + >> New encryption modes can be added relatively easily, without changes >> to individual filesystems. However, authenticated encryption (AE) >> modes are not currently supported because of the difficulty of dealing >> with ciphertext expansion. >> >> +Contents encryption >> +------------------- >> + >> For file contents, each filesystem block is encrypted independently. >> Currently, only the case where the filesystem block size is equal to >> -the system's page size (usually 4096 bytes) is supported. With the >> -XTS mode of operation (recommended), the logical block number within >> -the file is used as the IV. With the CBC mode of operation (not >> -recommended), ESSIV is used; specifically, the IV for CBC is the >> -logical block number encrypted with AES-256, where the AES-256 key is >> -the SHA-256 hash of the inode's data encryption key. >> +the system's page size (usually 4096 bytes) is supported. >> + >> +With the XTS mode of operation, the logical block number within the >> +file is used as the IV. >> + >> +With the CBC mode of operation, ESSIV is used. Specifically, the IV >> +is the file logical block number encrypted with AES-256, where the >> +AES-256 key is the SHA-256 hash of the inode's data encryption key. >> + >> +With ChaCha20, the file logical block number is also used as the IV, >> +but it is formatted differently to ensure that it is copied into the >> +"nonce" portion of the ChaCha20 initial state (words 14-15) rather >> +than the "block counter" portion (words 12-13). This detail is >> +critical, since otherwise different portions of the file would be >> +encrypted with the same keystream. >> + >> +Filenames encryption >> +-------------------- >> >> For filenames, the full filename is encrypted at once. Because of the >> requirements to retain support for efficient directory lookups and >> diff --git a/fs/crypto/Kconfig b/fs/crypto/Kconfig >> index 02b7d91c9231..44f052e9d842 100644 >> --- a/fs/crypto/Kconfig >> +++ b/fs/crypto/Kconfig >> @@ -3,6 +3,7 @@ config FS_ENCRYPTION >> select CRYPTO >> select CRYPTO_AES >> select CRYPTO_CBC >> + select CRYPTO_CHACHA20 >> select CRYPTO_ECB >> select CRYPTO_XTS >> select CRYPTO_CTS >> diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c >> index 732a786cce9d..d5c95a18db59 100644 >> --- a/fs/crypto/crypto.c >> +++ b/fs/crypto/crypto.c >> @@ -126,15 +126,66 @@ struct fscrypt_ctx *fscrypt_get_ctx(const struct inode *inode, gfp_t gfp_flags) >> } >> EXPORT_SYMBOL(fscrypt_get_ctx); >> >> +struct fscrypt_iv { >> + __le64 first_half; >> + __le64 second_half; >> +}; >> + >> +/* >> + * Generate the IV for encrypting/decrypting the block at the given logical >> + * block number within a file. >> + */ >> +static void fscrypt_generate_iv(struct fscrypt_iv *iv, u64 lblk_num, >> + const struct fscrypt_info *ci) >> +{ >> + BUILD_BUG_ON(sizeof(*iv) != FS_IV_SIZE); >> + >> + if (ci->ci_data_mode == FS_ENCRYPTION_MODE_CHACHA20) { >> + /* >> + * ChaCha20 interprets its IV as a block counter followed by a >> + * nonce. We *MUST NOT* use the file logical block number as >> + * the Chacha block counter because the ChaCha block counter >> + * counts 64-byte ChaCha blocks, which are much smaller than >> + * file blocks. If we did, then portions of the keystream would >> + * be repeated, which would be catastrophic. >> + * > > OK, so you are saying that LBA n + 1 will share its keystream with LBA > n but shift by 64 blocks, right? Yeah, that's terrible. > shift-ed by 64 *bytes*
On 8 December 2017 at 09:11, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote: > On 8 December 2017 at 09:11, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote: >> Hi Eric, >> >> On 8 December 2017 at 01:38, Eric Biggers <ebiggers3@gmail.com> wrote: >>> From: Eric Biggers <ebiggers@google.com> >>> >>> fscrypt currently only supports AES encryption. However, many low-end >>> mobile devices still use older CPUs such as ARMv7, which do not support >>> the AES instructions (the ARMv8 Cryptography Extensions). This results >>> in very poor AES performance, even if the NEON bit-sliced implementation >>> is used. Roughly 20-40 MB/s is a typical number, in comparison to >>> 300-800 MB/s on CPUs that support the AES instructions. Switching from >>> AES-256 to AES-128 only helps by about 30%. >>> >>> The result is that vendors don't enable encryption on these devices, >>> leaving users unprotected. >>> >>> A performance difference of similar magnitude can also be observed on >>> x86, between CPUs with and without the AES-NI instruction set. >>> >>> This patch provides an alternative to AES by updating fscrypt to support >>> the ChaCha20 stream cipher (RFC7539) for contents encryption. ChaCha20 >>> was designed to have a large security margin, to be efficient on >>> general-purpose CPUs without dedicated instructions, and to be >>> vectorizable. It is already supported by the Linux crypto API, >>> including a vectorized implementation for ARM using NEON instructions, >>> and vectorized implementations for x86 using SSSE3 or AVX2 instructions. >>> >>> On 32-bit ARM processors with NEON support, ChaCha20 is about 3.2 times >>> faster than AES-128-XTS (chacha20-neon vs. xts-aes-neonbs). Without >>> NEON support, ChaCha20 is about 1.5 times as fast (chacha20-generic vs. >>> xts(aes-asm)). The improvement over AES-256-XTS is even greater. >>> >>> Note that stream ciphers are not an ideal choice for disk encryption, >>> since each data block has to be encrypted with the same IV each time it >>> is overwritten. Consequently, an adversary who observes the ciphertext >>> both before and after a write can trivially recover the keystream if >>> they can guess one of the plaintexts. Moreover, an adversary who can >>> write to the ciphertext can flip arbitrary bits in the plaintext, merely >>> by flipping the corresponding bits in the ciphertext. A block cipher >>> operating in the XTS or CBC-ESSIV mode provides some protection against >>> these types of attacks -- albeit not full protection, which would at >>> minimum require the use an authenticated encryption mode with nonces. >>> >>> Unfortunately, we are unaware of any block cipher which performs as well >>> as ChaCha20, has a similar or greater security margin, and has been >>> subject to as much public security analysis. We do not consider Speck >>> to be a viable alternative at this time. >>> >>> Still, a stream cipher is sufficient to protect data confidentiality in >>> the event of a single point-in-time permanent offline compromise of the >>> disk, which currently is the primary threat model for fscrypt. Thus, >>> when the alternative is quite literally *no encryption*, we might as >>> well use a stream cipher. >>> >>> We offer ChaCha20 rather than the reduced-round variants ChaCha8 or >>> ChaCha12 because ChaCha20 has a much higher security margin, and we are >>> primarily targeting CPUs where ChaCha20 is fast enough, in particular >>> CPUs that have vector instructions such as NEON or SSSE3. Also, the >>> crypto API currently only supports ChaCha20. Still, if ChaCha8 and/or >>> ChaCha12 support were to be added to the crypto API, it would be >>> straightforward to support them in fscrypt too. >>> >>> Currently, stream ciphers cannot be used for filenames encryption with >>> fscrypt because all filenames in a directory have to be encrypted with >>> the same IV. Therefore, we offer ChaCha20 for contents encryption only. >>> Filenames encryption still must use AES-256-CTS-CBC. This is acceptable >>> because filenames encryption is not as performance-critical as contents >>> encryption. >>> >>> Reviewed-by: Michael Halcrow <mhalcrow@google.com> >>> Signed-off-by: Eric Biggers <ebiggers@google.com> >>> --- >>> Documentation/filesystems/fscrypt.rst | 43 +++++++++++++++++++--- >>> fs/crypto/Kconfig | 1 + >>> fs/crypto/crypto.c | 69 ++++++++++++++++++++++++++++------- >>> fs/crypto/keyinfo.c | 2 + >>> include/linux/fscrypt.h | 6 ++- >>> include/uapi/linux/fs.h | 1 + >>> 6 files changed, 102 insertions(+), 20 deletions(-) >>> >>> diff --git a/Documentation/filesystems/fscrypt.rst b/Documentation/filesystems/fscrypt.rst >>> index 776ddc655f79..927d3c88816b 100644 >>> --- a/Documentation/filesystems/fscrypt.rst >>> +++ b/Documentation/filesystems/fscrypt.rst >>> @@ -184,6 +184,9 @@ replaced with HKDF or another more standard KDF in the future. >>> Encryption modes and usage >>> ========================== >>> >>> +Available modes >>> +--------------- >>> + >>> fscrypt allows one encryption mode to be specified for file contents >>> and one encryption mode to be specified for filenames. Different >>> directory trees are permitted to use different encryption modes. >>> @@ -191,24 +194,52 @@ Currently, the following pairs of encryption modes are supported: >>> >>> - AES-256-XTS for contents and AES-256-CTS-CBC for filenames >>> - AES-128-CBC for contents and AES-128-CTS-CBC for filenames >>> +- ChaCha20 for contents and AES-256-CTS-CBC for filenames >>> >>> It is strongly recommended to use AES-256-XTS for contents encryption. >>> AES-128-CBC was added only for low-powered embedded devices with >>> crypto accelerators such as CAAM or CESA that do not support XTS. >>> >>> +Similarly, ChaCha20 was only added for low-end devices that have >>> +neither a CPU with AES instructions, nor a hardware crypto >>> +accelerator. Note that since ChaCha20 is a stream cipher, it is >>> +easily broken if an attacker can view encrypted data both before and >>> +after it is overwritten. Thus, even moreso than the other modes, >>> +ChaCha20 can protect data confidentiality *only* in the event of a >>> +single point-in-time, permanent offline compromise of the storage. >>> +Also, ChaCha20 is supported only for contents encryption, not >>> +filenames encryption, because all filenames in a directory have to be >>> +encrypted with the same IV, which would be especially inappropriate >>> +for a stream cipher. >>> + >>> New encryption modes can be added relatively easily, without changes >>> to individual filesystems. However, authenticated encryption (AE) >>> modes are not currently supported because of the difficulty of dealing >>> with ciphertext expansion. >>> >>> +Contents encryption >>> +------------------- >>> + >>> For file contents, each filesystem block is encrypted independently. >>> Currently, only the case where the filesystem block size is equal to >>> -the system's page size (usually 4096 bytes) is supported. With the >>> -XTS mode of operation (recommended), the logical block number within >>> -the file is used as the IV. With the CBC mode of operation (not >>> -recommended), ESSIV is used; specifically, the IV for CBC is the >>> -logical block number encrypted with AES-256, where the AES-256 key is >>> -the SHA-256 hash of the inode's data encryption key. >>> +the system's page size (usually 4096 bytes) is supported. >>> + >>> +With the XTS mode of operation, the logical block number within the >>> +file is used as the IV. >>> + >>> +With the CBC mode of operation, ESSIV is used. Specifically, the IV >>> +is the file logical block number encrypted with AES-256, where the >>> +AES-256 key is the SHA-256 hash of the inode's data encryption key. >>> + >>> +With ChaCha20, the file logical block number is also used as the IV, >>> +but it is formatted differently to ensure that it is copied into the >>> +"nonce" portion of the ChaCha20 initial state (words 14-15) rather >>> +than the "block counter" portion (words 12-13). This detail is >>> +critical, since otherwise different portions of the file would be >>> +encrypted with the same keystream. >>> + >>> +Filenames encryption >>> +-------------------- >>> >>> For filenames, the full filename is encrypted at once. Because of the >>> requirements to retain support for efficient directory lookups and >>> diff --git a/fs/crypto/Kconfig b/fs/crypto/Kconfig >>> index 02b7d91c9231..44f052e9d842 100644 >>> --- a/fs/crypto/Kconfig >>> +++ b/fs/crypto/Kconfig >>> @@ -3,6 +3,7 @@ config FS_ENCRYPTION >>> select CRYPTO >>> select CRYPTO_AES >>> select CRYPTO_CBC >>> + select CRYPTO_CHACHA20 >>> select CRYPTO_ECB >>> select CRYPTO_XTS >>> select CRYPTO_CTS >>> diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c >>> index 732a786cce9d..d5c95a18db59 100644 >>> --- a/fs/crypto/crypto.c >>> +++ b/fs/crypto/crypto.c >>> @@ -126,15 +126,66 @@ struct fscrypt_ctx *fscrypt_get_ctx(const struct inode *inode, gfp_t gfp_flags) >>> } >>> EXPORT_SYMBOL(fscrypt_get_ctx); >>> >>> +struct fscrypt_iv { >>> + __le64 first_half; >>> + __le64 second_half; >>> +}; >>> + >>> +/* >>> + * Generate the IV for encrypting/decrypting the block at the given logical >>> + * block number within a file. >>> + */ >>> +static void fscrypt_generate_iv(struct fscrypt_iv *iv, u64 lblk_num, >>> + const struct fscrypt_info *ci) >>> +{ >>> + BUILD_BUG_ON(sizeof(*iv) != FS_IV_SIZE); >>> + >>> + if (ci->ci_data_mode == FS_ENCRYPTION_MODE_CHACHA20) { >>> + /* >>> + * ChaCha20 interprets its IV as a block counter followed by a >>> + * nonce. We *MUST NOT* use the file logical block number as >>> + * the Chacha block counter because the ChaCha block counter >>> + * counts 64-byte ChaCha blocks, which are much smaller than >>> + * file blocks. If we did, then portions of the keystream would >>> + * be repeated, which would be catastrophic. >>> + * >> >> OK, so you are saying that LBA n + 1 will share its keystream with LBA >> n but shift by 64 blocks, right? Yeah, that's terrible. >> > > shift-ed by 64 *bytes* Actually, this appears to be a flaw in our implementation of ChaCha20. According to RFC7539: The inputs to ChaCha20 are: o A 256-bit key o A 32-bit initial counter. This can be set to any number, but will usually be zero or one. It makes sense to use one if we use the zero block for something else, such as generating a one-time authenticator key as part of an AEAD algorithm. o A 96-bit nonce. In some protocols, this is known as the Initialization Vector. o An arbitrary-length plaintext and so the initial value of the counter should be an internal parameter of the implementation, not something that is exposed via the IV input parameter. Given how it is not uncommon for counters to be used as IV, this is a fundamental flaw that could rear its head in other places as well, so I propose we fix this one way (fix the current code) or the other (deprecate the current code and create a new chacha20-rfc7539 blockcipher that uses a 96-bit IV and sets the counter to 0)
Am Freitag, 8. Dezember 2017, 11:06:31 CET schrieb Ard Biesheuvel: Hi Ard, > > Given how it is not uncommon for counters to be used as IV, this is a > fundamental flaw that could rear its head in other places as well, so > I propose we fix this one way (fix the current code) or the other > (deprecate the current code and create a new chacha20-rfc7539 > blockcipher that uses a 96-bit IV and sets the counter to 0) Instead of having a complete new implementation of the ChaCha20 cipher, what about using a specific IV generator for which the kernel crypto API has already support (see crypto/seqiv.c for example)? I.e. we have the current ChaCha20 cipher, but use some "rfc7539iv(chacha20)" cipher mode where that rfc7539iv is the mentioned IV generator that turns the given IV (sector number?) into the proper IV for ChaCha20. Ciao Stephan
On 8 December 2017 at 10:14, Stephan Mueller <smueller@chronox.de> wrote: > Am Freitag, 8. Dezember 2017, 11:06:31 CET schrieb Ard Biesheuvel: > > Hi Ard, > >> >> Given how it is not uncommon for counters to be used as IV, this is a >> fundamental flaw that could rear its head in other places as well, so >> I propose we fix this one way (fix the current code) or the other >> (deprecate the current code and create a new chacha20-rfc7539 >> blockcipher that uses a 96-bit IV and sets the counter to 0) > > Instead of having a complete new implementation of the ChaCha20 cipher, what > about using a specific IV generator for which the kernel crypto API has > already support (see crypto/seqiv.c for example)? > > I.e. we have the current ChaCha20 cipher, but use some "rfc7539iv(chacha20)" > cipher mode where that rfc7539iv is the mentioned IV generator that turns the > given IV (sector number?) into the proper IV for ChaCha20. > To be honest, I don't fully understand how the IV generators work. seqiv is implemented as an AEAD not as a skcipher, and we'd need to wrap chacha20 in something that is usable as a skcipher. In any case, it does make sense to address this by wrapping chacha20 in something generic, rather than having to extend all implementations.
On Fri, Dec 08, 2017 at 07:20:43AM +0000, Ard Biesheuvel wrote: > On 8 December 2017 at 02:51, Jason A. Donenfeld <Jason@zx2c4.com> wrote: > > Hi Eric, > > > > Nice to see more use of ChaCha20. However... > > > > Can we skip over the "sort of worse than XTS, but not having _real_ > > authentication sucks anyway in either case, so whatever" and move > > directly to, "linux finally supports authenticated encryption for disk > > encryption!"? > > Ehm, it doesn't? This is plain ChaCha20, not any AEAD variant. > > > This would be a big deal and would actually be a > > noticeable security improvement, instead of a potentially dubious step > > sidewaysbackish. > > > > It is actually dubious, given the large scale reuse of IVs with a > stream cipher. I do suppose though that using an AEAD variant would at > least catch any attacks involving flipping ciphertext bits resulting > in plaintext bits being flipped at the same offset (but file updates > would still be visible in the clear) > It *is* dubious, but it would be a replacement for No Encryption, not a replacement for AES. AES would continue to be required on devices that can do AES fast enough. This would only be for devices that do not meet the AES performance bar, so their status quo is No Encryption. I know, it is fun to poke holes in bad crypto, but much less interesting to poke holes in "no crypto" :-) We can't use authenticated encryption for the same reason we can't use random or sequential nonces: there is nowhere to store the additional metadata (authentication tag and nonce) per filesystem block *and* have it updated atomically with respect to the contents of said block. Copy-on-write filesystems such as btrfs or bcachefs can do it. Traditional filesystems cannot. F2FS comes closer than EXT4 since F2FS is based on a log-structured filesystem, but only partially; for one, it still updates data in-place sometimes. This is not a new problem; this is also the reason why we haven't been able to add AES-GCM support yet. Authentication aside, the greater problem here is the IV reuse. Unfortunately it actually will likely be even worse than we thought originally, because this would be used on flash storage that does wear leveling, and likely also with F2FS which often doesn't overwrite data in-place. So even under the "single point-in-time permanent offline compromise" threat model it may not be good enough. We are going to spend some more time investigating alternatives, but unfortunately there are not many. Eric
> Still, a stream cipher is sufficient to protect data confidentiality in > the event of a single point-in-time permanent offline compromise of the > disk, which currently is the primary threat model for fscrypt. Thus, > when the alternative is quite literally *no encryption*, we might as > well use a stream cipher. The "single point in time" requirement is kind of interesting. I believe you are saying the scheme lacks semantic security. Forgive my ignorance... Does that mean this cipher should not be used when backups are in effect; or sync'ing to <insert favorite cloud provider> happens? Jeff On Thu, Dec 7, 2017 at 8:38 PM, Eric Biggers <ebiggers3@gmail.com> wrote: > From: Eric Biggers <ebiggers@google.com> > > fscrypt currently only supports AES encryption. However, many low-end > mobile devices still use older CPUs such as ARMv7, which do not support > the AES instructions (the ARMv8 Cryptography Extensions). This results > in very poor AES performance, even if the NEON bit-sliced implementation > is used. Roughly 20-40 MB/s is a typical number, in comparison to > 300-800 MB/s on CPUs that support the AES instructions. Switching from > AES-256 to AES-128 only helps by about 30%. > > The result is that vendors don't enable encryption on these devices, > leaving users unprotected. > > A performance difference of similar magnitude can also be observed on > x86, between CPUs with and without the AES-NI instruction set. > > This patch provides an alternative to AES by updating fscrypt to support > the ChaCha20 stream cipher (RFC7539) for contents encryption. ChaCha20 > was designed to have a large security margin, to be efficient on > general-purpose CPUs without dedicated instructions, and to be > vectorizable. It is already supported by the Linux crypto API, > including a vectorized implementation for ARM using NEON instructions, > and vectorized implementations for x86 using SSSE3 or AVX2 instructions. > > On 32-bit ARM processors with NEON support, ChaCha20 is about 3.2 times > faster than AES-128-XTS (chacha20-neon vs. xts-aes-neonbs). Without > NEON support, ChaCha20 is about 1.5 times as fast (chacha20-generic vs. > xts(aes-asm)). The improvement over AES-256-XTS is even greater. > > Note that stream ciphers are not an ideal choice for disk encryption, > since each data block has to be encrypted with the same IV each time it > is overwritten. Consequently, an adversary who observes the ciphertext > both before and after a write can trivially recover the keystream if > they can guess one of the plaintexts. Moreover, an adversary who can > write to the ciphertext can flip arbitrary bits in the plaintext, merely > by flipping the corresponding bits in the ciphertext. A block cipher > operating in the XTS or CBC-ESSIV mode provides some protection against > these types of attacks -- albeit not full protection, which would at > minimum require the use an authenticated encryption mode with nonces. > > Unfortunately, we are unaware of any block cipher which performs as well > as ChaCha20, has a similar or greater security margin, and has been > subject to as much public security analysis. We do not consider Speck > to be a viable alternative at this time. > > Still, a stream cipher is sufficient to protect data confidentiality in > the event of a single point-in-time permanent offline compromise of the > disk, which currently is the primary threat model for fscrypt. Thus, > when the alternative is quite literally *no encryption*, we might as > well use a stream cipher. > > We offer ChaCha20 rather than the reduced-round variants ChaCha8 or > ChaCha12 because ChaCha20 has a much higher security margin, and we are > primarily targeting CPUs where ChaCha20 is fast enough, in particular > CPUs that have vector instructions such as NEON or SSSE3. Also, the > crypto API currently only supports ChaCha20. Still, if ChaCha8 and/or > ChaCha12 support were to be added to the crypto API, it would be > straightforward to support them in fscrypt too. > > Currently, stream ciphers cannot be used for filenames encryption with > fscrypt because all filenames in a directory have to be encrypted with > the same IV. Therefore, we offer ChaCha20 for contents encryption only. > Filenames encryption still must use AES-256-CTS-CBC. This is acceptable > because filenames encryption is not as performance-critical as contents > encryption. > > ...
On Fri, Dec 08, 2017 at 07:48:54PM -0500, Jeffrey Walton wrote: > > Still, a stream cipher is sufficient to protect data confidentiality in > > the event of a single point-in-time permanent offline compromise of the > > disk, which currently is the primary threat model for fscrypt. Thus, > > when the alternative is quite literally *no encryption*, we might as > > well use a stream cipher. > > The "single point in time" requirement is kind of interesting. I > believe you are saying the scheme lacks semantic security. Well, it is semantically secure when looking at encryptions/decryptions done in the context of different blocks (different IVs) but not semantically secure when looking at encryptions/decryptions done in the context of the same block (same IV). But in that regard it is the same as the other modes such as AES-XTS or AES-CBC. So I think you are missing the point, which is that a stream cipher fails more catastrophically than the other modes when IVs are reused. > > Forgive my ignorance... Does that mean this cipher should not be used > when backups are in effect; or sync'ing to <insert favorite cloud > provider> happens? Normally backup or sync software will operate on the plaintext, which makes whatever type of filesystem-level or disk encryption you happen to be using irrelevant. But at a more abstract level, intentional copies (in addition to "unintentional" copies that may be done by the filesystem or flash storage) are certainly a way that you could end up with multiple ciphertexts for the same block in existence at the same time, so that would indeed need to be accounted for in the assumptions. Eric
> On 08.12.2017, at 03:51, Jason A. Donenfeld <Jason@zx2c4.com> wrote: > > Hi Eric, > > Nice to see more use of ChaCha20. However... > > Can we skip over the "sort of worse than XTS, but not having _real_ > authentication sucks anyway in either case, so whatever" and move > directly to, "linux finally supports authenticated encryption for disk > encryption!"? This would be a big deal and would actually be a > noticeable security improvement, instead of a potentially dubious step > sidewaysbackish. Out of curiosity, does anybody know of any specific attacks that authenticated encryption for disk encryption would solve as opposed to just using encryption with AES-XTS? To my knowledge the XTS mode is frowned upon [1], but I don't know of any serious flaws that would eg. allow an attacker to modify file contents without a *serious* amount of effort. CBC is another story though [2]. Don't get me wrong, I'd like to have authenticated encryption too. In fact we are currently working on a concept for adding authentication to UBIFS (I'll share more details as soon as its in a presentable state). However, the reason for this is mainly because UBIFS does *not* operate on the block layer, so dm-integrity/dm-verity is not an option and fscrypt only protects the confidentiality of file contents and filenames. This means that the filesystem index is unprotected which makes it rather easy to move files around - eg. replace /bin/bash with something completely different without knowing the fscrypt master key or any derived key. For the general use case though (eg. securing *really important* files on my desktop), I'd use authenticated encryption at a higher layer to get more flexibility to eg. easily use explicit IVs over implicit ones derived from block/sector number. But maybe there are some uses cases I didn't think of just now... :) David [1] https://sockpuppet.org/blog/2014/04/30/you-dont-want-xts/ [2] http://www.jakoblell.com/blog/2013/12/22/practical-malleability-attack-against-cbc-encrypted-luks-partitions/
diff --git a/Documentation/filesystems/fscrypt.rst b/Documentation/filesystems/fscrypt.rst index 776ddc655f79..927d3c88816b 100644 --- a/Documentation/filesystems/fscrypt.rst +++ b/Documentation/filesystems/fscrypt.rst @@ -184,6 +184,9 @@ replaced with HKDF or another more standard KDF in the future. Encryption modes and usage ========================== +Available modes +--------------- + fscrypt allows one encryption mode to be specified for file contents and one encryption mode to be specified for filenames. Different directory trees are permitted to use different encryption modes. @@ -191,24 +194,52 @@ Currently, the following pairs of encryption modes are supported: - AES-256-XTS for contents and AES-256-CTS-CBC for filenames - AES-128-CBC for contents and AES-128-CTS-CBC for filenames +- ChaCha20 for contents and AES-256-CTS-CBC for filenames It is strongly recommended to use AES-256-XTS for contents encryption. AES-128-CBC was added only for low-powered embedded devices with crypto accelerators such as CAAM or CESA that do not support XTS. +Similarly, ChaCha20 was only added for low-end devices that have +neither a CPU with AES instructions, nor a hardware crypto +accelerator. Note that since ChaCha20 is a stream cipher, it is +easily broken if an attacker can view encrypted data both before and +after it is overwritten. Thus, even moreso than the other modes, +ChaCha20 can protect data confidentiality *only* in the event of a +single point-in-time, permanent offline compromise of the storage. +Also, ChaCha20 is supported only for contents encryption, not +filenames encryption, because all filenames in a directory have to be +encrypted with the same IV, which would be especially inappropriate +for a stream cipher. + New encryption modes can be added relatively easily, without changes to individual filesystems. However, authenticated encryption (AE) modes are not currently supported because of the difficulty of dealing with ciphertext expansion. +Contents encryption +------------------- + For file contents, each filesystem block is encrypted independently. Currently, only the case where the filesystem block size is equal to -the system's page size (usually 4096 bytes) is supported. With the -XTS mode of operation (recommended), the logical block number within -the file is used as the IV. With the CBC mode of operation (not -recommended), ESSIV is used; specifically, the IV for CBC is the -logical block number encrypted with AES-256, where the AES-256 key is -the SHA-256 hash of the inode's data encryption key. +the system's page size (usually 4096 bytes) is supported. + +With the XTS mode of operation, the logical block number within the +file is used as the IV. + +With the CBC mode of operation, ESSIV is used. Specifically, the IV +is the file logical block number encrypted with AES-256, where the +AES-256 key is the SHA-256 hash of the inode's data encryption key. + +With ChaCha20, the file logical block number is also used as the IV, +but it is formatted differently to ensure that it is copied into the +"nonce" portion of the ChaCha20 initial state (words 14-15) rather +than the "block counter" portion (words 12-13). This detail is +critical, since otherwise different portions of the file would be +encrypted with the same keystream. + +Filenames encryption +-------------------- For filenames, the full filename is encrypted at once. Because of the requirements to retain support for efficient directory lookups and diff --git a/fs/crypto/Kconfig b/fs/crypto/Kconfig index 02b7d91c9231..44f052e9d842 100644 --- a/fs/crypto/Kconfig +++ b/fs/crypto/Kconfig @@ -3,6 +3,7 @@ config FS_ENCRYPTION select CRYPTO select CRYPTO_AES select CRYPTO_CBC + select CRYPTO_CHACHA20 select CRYPTO_ECB select CRYPTO_XTS select CRYPTO_CTS diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c index 732a786cce9d..d5c95a18db59 100644 --- a/fs/crypto/crypto.c +++ b/fs/crypto/crypto.c @@ -126,15 +126,66 @@ struct fscrypt_ctx *fscrypt_get_ctx(const struct inode *inode, gfp_t gfp_flags) } EXPORT_SYMBOL(fscrypt_get_ctx); +struct fscrypt_iv { + __le64 first_half; + __le64 second_half; +}; + +/* + * Generate the IV for encrypting/decrypting the block at the given logical + * block number within a file. + */ +static void fscrypt_generate_iv(struct fscrypt_iv *iv, u64 lblk_num, + const struct fscrypt_info *ci) +{ + BUILD_BUG_ON(sizeof(*iv) != FS_IV_SIZE); + + if (ci->ci_data_mode == FS_ENCRYPTION_MODE_CHACHA20) { + /* + * ChaCha20 interprets its IV as a block counter followed by a + * nonce. We *MUST NOT* use the file logical block number as + * the Chacha block counter because the ChaCha block counter + * counts 64-byte ChaCha blocks, which are much smaller than + * file blocks. If we did, then portions of the keystream would + * be repeated, which would be catastrophic. + * + * We could initialize the block counter with the offset in the + * file in ChaCha blocks. But RFC7539 defines the ChaCha20 + * block counter to be 32-bit, which is only enough for a 256GiB + * keystream. Confusingly, this differs from the original + * ChaCha paper which defines the block counter to be 64-bit. + * + * To be compatible with either convention, just put the file + * logical block number in the second half of the IV, so that it + * goes into the "nonce" portion of the ChaCha initial state + * (words 14-15). The ChaCha block counter then starts at 0 for + * each file block. In other words, we use one keystream per + * file block instead of one keystream per file. + */ + iv->first_half = 0; + iv->second_half = cpu_to_le64(lblk_num); + + BUG_ON(ci->ci_essiv_tfm != NULL); + } else { + /* XTS or CBC */ + iv->first_half = cpu_to_le64(lblk_num); + iv->second_half = 0; + + if (ci->ci_essiv_tfm != NULL) { + /* CBC */ + BUILD_BUG_ON(AES_BLOCK_SIZE != FS_IV_SIZE); + crypto_cipher_encrypt_one(ci->ci_essiv_tfm, + (u8 *)iv, (u8 *)iv); + } + } +} + int fscrypt_do_page_crypto(const struct inode *inode, fscrypt_direction_t rw, u64 lblk_num, struct page *src_page, struct page *dest_page, unsigned int len, unsigned int offs, gfp_t gfp_flags) { - struct { - __le64 index; - u8 padding[FS_IV_SIZE - sizeof(__le64)]; - } iv; + struct fscrypt_iv iv; struct skcipher_request *req = NULL; DECLARE_CRYPTO_WAIT(wait); struct scatterlist dst, src; @@ -144,15 +195,7 @@ int fscrypt_do_page_crypto(const struct inode *inode, fscrypt_direction_t rw, BUG_ON(len == 0); - BUILD_BUG_ON(sizeof(iv) != FS_IV_SIZE); - BUILD_BUG_ON(AES_BLOCK_SIZE != FS_IV_SIZE); - iv.index = cpu_to_le64(lblk_num); - memset(iv.padding, 0, sizeof(iv.padding)); - - if (ci->ci_essiv_tfm != NULL) { - crypto_cipher_encrypt_one(ci->ci_essiv_tfm, (u8 *)&iv, - (u8 *)&iv); - } + fscrypt_generate_iv(&iv, lblk_num, ci); req = skcipher_request_alloc(tfm, gfp_flags); if (!req) { diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c index 5e6e846f5a24..bae4cce2389a 100644 --- a/fs/crypto/keyinfo.c +++ b/fs/crypto/keyinfo.c @@ -13,6 +13,7 @@ #include <linux/scatterlist.h> #include <linux/ratelimit.h> #include <crypto/aes.h> +#include <crypto/chacha20.h> #include <crypto/sha.h> #include "fscrypt_private.h" @@ -134,6 +135,7 @@ static const struct { FS_AES_128_CBC_KEY_SIZE }, [FS_ENCRYPTION_MODE_AES_128_CTS] = { "cts(cbc(aes))", FS_AES_128_CTS_KEY_SIZE }, + [FS_ENCRYPTION_MODE_CHACHA20] = { "chacha20", CHACHA20_KEY_SIZE }, }; static int determine_cipher_type(struct fscrypt_info *ci, struct inode *inode, diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h index 08b4b40c5aa8..1cfb7950f915 100644 --- a/include/linux/fscrypt.h +++ b/include/linux/fscrypt.h @@ -100,11 +100,15 @@ static inline bool fscrypt_dummy_context_enabled(struct inode *inode) static inline bool fscrypt_valid_enc_modes(u32 contents_mode, u32 filenames_mode) { + if (contents_mode == FS_ENCRYPTION_MODE_AES_256_XTS && + filenames_mode == FS_ENCRYPTION_MODE_AES_256_CTS) + return true; + if (contents_mode == FS_ENCRYPTION_MODE_AES_128_CBC && filenames_mode == FS_ENCRYPTION_MODE_AES_128_CTS) return true; - if (contents_mode == FS_ENCRYPTION_MODE_AES_256_XTS && + if (contents_mode == FS_ENCRYPTION_MODE_CHACHA20 && filenames_mode == FS_ENCRYPTION_MODE_AES_256_CTS) return true; diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h index 4199f8acbce5..5a25eb2994b1 100644 --- a/include/uapi/linux/fs.h +++ b/include/uapi/linux/fs.h @@ -275,6 +275,7 @@ struct fsxattr { #define FS_ENCRYPTION_MODE_AES_256_CTS 4 #define FS_ENCRYPTION_MODE_AES_128_CBC 5 #define FS_ENCRYPTION_MODE_AES_128_CTS 6 +#define FS_ENCRYPTION_MODE_CHACHA20 7 struct fscrypt_policy { __u8 version;