Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4286f44b authored by Eric Biggers's avatar Eric Biggers
Browse files

BACKPORT: FROMLIST: fscrypt: add support for IV_INO_LBLK_32 policies 



The eMMC inline crypto standard will only specify 32 DUN bits (a.k.a. IV
bits), unlike UFS's 64.  IV_INO_LBLK_64 is therefore not applicable, but
an encryption format which uses one key per policy and permits the
moving of encrypted file contents (as f2fs's garbage collector requires)
is still desirable.

To support such hardware, add a new encryption format IV_INO_LBLK_32
that makes the best use of the 32 bits: the IV is set to
'SipHash-2-4(inode_number) + file_logical_block_number mod 2^32', where
the SipHash key is derived from the fscrypt master key.  We hash only
the inode number and not also the block number, because we need to
maintain contiguity of DUNs to merge bios.

Unlike with IV_INO_LBLK_64, with this format IV reuse is possible; this
is unavoidable given the size of the DUN.  This means this format should
only be used where the requirements of the first paragraph apply.
However, the hash spreads out the IVs in the whole usable range, and the
use of a keyed hash makes it difficult for an attacker to determine
which files use which IVs.

Besides the above differences, this flag works like IV_INO_LBLK_64 in
that on ext4 it is only allowed if the stable_inodes feature has been
enabled to prevent inode numbers and the filesystem UUID from changing.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>

Link: https://lore.kernel.org/r/20200515204141.251098-1-ebiggers@kernel.org

(Resolved conflicts with inline encryption support.  Besides the
 necessary "straightforward" merge resolutions, also made
 fscrypt_get_dun_bytes() aware of IV_INO_LBLK_32 and made IV_INO_LBLK_32
 usable with wrapped keys.)

Test: 'atest vts_kernel_encryption_test' on Cuttlefish with
      the IV_INO_LBLK_32 test added (http://aosp/1315024).

      Also tested enabling this in the fstab for Cuttlefish
      (using http://aosp/1315886

).

      Also ran 'kvm-xfstests -c ext4,f2fs -g encrypt', including my
      work-in-progress xfstest for IV_INO_LBLK_32.

Bug: 144046242
Change-Id: I57df71d502bde0475efc906a0812102063ff2f2a
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent cdea8a1e

Documentation/filesystems/fscrypt.rst

+29 −4
Original line number Diff line number Diff line
@@ -292,8 +292,22 @@ files' data differently, inode numbers are included in the IVs. 
Consequently, shrinking the filesystem may not be allowed.



This format is optimized for use with inline encryption hardware

compliant with the UFS or eMMC standards, which support only 64 IV

bits per I/O request and may have only a small number of keyslots.

compliant with the UFS standard, which supports only 64 IV bits per

I/O request and may have only a small number of keyslots.



IV_INO_LBLK_32 policies

-----------------------



IV_INO_LBLK_32 policies work like IV_INO_LBLK_64, except that for

IV_INO_LBLK_32, the inode number is hashed with SipHash-2-4 (where the

SipHash key is derived from the master key) and added to the file

logical block number mod 2^32 to produce a 32-bit IV.



This format is optimized for use with inline encryption hardware

compliant with the eMMC v5.2 standard, which supports only 32 IV bits

per I/O request and may have only a small number of keyslots.  This

format results in some level of IV reuse, so it should only be used

when necessary due to hardware limitations.



Key identifiers

---------------
@@ -369,6 +383,10 @@ a little endian number, except that: 
  to 32 bits and is placed in bits 0-31 of the IV.  The inode number

  (which is also limited to 32 bits) is placed in bits 32-63.



- With `IV_INO_LBLK_32 policies`_, the logical block number is limited

  to 32 bits and is placed in bits 0-31 of the IV.  The inode number

  is then hashed and added mod 2^32.



Note that because file logical block numbers are included in the IVs,

filesystems must enforce that blocks are never shifted around within

encrypted files, e.g. via "collapse range" or "insert range".
@@ -465,8 +483,15 @@ This structure must be initialized as follows: 
    (0x3).

  - FSCRYPT_POLICY_FLAG_DIRECT_KEY: See `DIRECT_KEY policies`_.

  - FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64: See `IV_INO_LBLK_64

    policies`_.  This is mutually exclusive with DIRECT_KEY and is not

    supported on v1 policies.

    policies`_.

  - FSCRYPT_POLICY_FLAG_IV_INO_LBLK_32: See `IV_INO_LBLK_32

    policies`_.



  v1 encryption policies only support the PAD_* and DIRECT_KEY flags.

  The other flags are only supported by v2 encryption policies.



  The DIRECT_KEY, IV_INO_LBLK_64, and IV_INO_LBLK_32 flags are

  mutually exclusive.



- For v2 encryption policies, ``__reserved`` must be zeroed.

fs/crypto/crypto.c

+5 −1
Original line number Diff line number Diff line
@@ -75,8 +75,12 @@ void fscrypt_generate_iv(union fscrypt_iv *iv, u64 lblk_num, 
	memset(iv, 0, ci->ci_mode->ivsize);



	if (flags & FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64) {

		WARN_ON_ONCE((u32)lblk_num != lblk_num);

		WARN_ON_ONCE(lblk_num > U32_MAX);

		WARN_ON_ONCE(ci->ci_inode->i_ino > U32_MAX);

		lblk_num |= (u64)ci->ci_inode->i_ino << 32;

	} else if (flags & FSCRYPT_POLICY_FLAG_IV_INO_LBLK_32) {

		WARN_ON_ONCE(lblk_num > U32_MAX);

		lblk_num = (u32)(ci->ci_hashed_ino + lblk_num);

	} else if (flags & FSCRYPT_POLICY_FLAG_DIRECT_KEY) {

		memcpy(iv->nonce, ci->ci_nonce, FS_KEY_DERIVATION_NONCE_SIZE);

	}

fs/crypto/fscrypt_private.h

+14 −3
Original line number Diff line number Diff line
@@ -246,6 +246,9 @@ struct fscrypt_info { 


	/* This inode's nonce, copied from the fscrypt_context */

	u8 ci_nonce[FS_KEY_DERIVATION_NONCE_SIZE];



	/* Hashed inode number.  Only set for IV_INO_LBLK_32 */

	u32 ci_hashed_ino;

};



typedef enum {
@@ -317,6 +320,8 @@ extern int fscrypt_init_hkdf(struct fscrypt_hkdf *hkdf, const u8 *master_key, 
#define HKDF_CONTEXT_DIRECT_KEY		3

#define HKDF_CONTEXT_IV_INO_LBLK_64_KEY	4

#define HKDF_CONTEXT_DIRHASH_KEY	5

#define HKDF_CONTEXT_IV_INO_LBLK_32_KEY	6

#define HKDF_CONTEXT_INODE_HASH_KEY	7



extern int fscrypt_hkdf_expand(const struct fscrypt_hkdf *hkdf, u8 context,

			       const u8 *info, unsigned int infolen,
@@ -513,11 +518,17 @@ struct fscrypt_master_key { 
	struct list_head	mk_decrypted_inodes;

	spinlock_t		mk_decrypted_inodes_lock;



	/* Per-mode keys for DIRECT_KEY policies, allocated on-demand */

	/*

	 * Per-mode encryption keys for the various types of encryption policies

	 * that use them.  Allocated and derived on-demand.

	 */

	struct fscrypt_prepared_key mk_direct_keys[__FSCRYPT_MODE_MAX + 1];



	/* Per-mode keys for IV_INO_LBLK_64 policies, allocated on-demand */

	struct fscrypt_prepared_key mk_iv_ino_lblk_64_keys[__FSCRYPT_MODE_MAX + 1];

	struct fscrypt_prepared_key mk_iv_ino_lblk_32_keys[__FSCRYPT_MODE_MAX + 1];



	/* Hash key for inode numbers.  Initialized only when needed. */

	siphash_key_t		mk_ino_hash_key;

	bool			mk_ino_hash_key_initialized;



} __randomize_layout;

fs/crypto/inline_crypt.c

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ static unsigned int fscrypt_get_dun_bytes(const struct fscrypt_info *ci) 
	if (flags & FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64)

		return sizeof(__le64);



	if (flags & FSCRYPT_POLICY_FLAG_IV_INO_LBLK_32)

		return sizeof(__le32);



	/* Default case: IVs are just the file logical block number */

	if (sb->s_cop->get_ino_and_lblk_bits)

		sb->s_cop->get_ino_and_lblk_bits(sb, &ino_bits, &lblk_bits);

fs/crypto/keyring.c

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ static void free_master_key(struct fscrypt_master_key *mk) 
	for (i = 0; i <= __FSCRYPT_MODE_MAX; i++) {

		fscrypt_destroy_prepared_key(&mk->mk_direct_keys[i]);

		fscrypt_destroy_prepared_key(&mk->mk_iv_ino_lblk_64_keys[i]);

		fscrypt_destroy_prepared_key(&mk->mk_iv_ino_lblk_32_keys[i]);

	}



	key_put(mk->mk_users);