Commit aec992aa authored by Eric Biggers's avatar Eric Biggers
Browse files

ubifs: allow both hash and disk name to be provided in no-key names 

In order to support a new dirhash method that is a secret-keyed hash
over the plaintext filenames (which will be used by encrypted+casefolded
directories on ext4 and f2fs), fscrypt will be switching to a new no-key
name format that always encodes the dirhash in the name.

UBIFS isn't happy with this because it has assertions that verify that
either the hash or the disk name is provided, not both.

Change it to use the disk name if one is provided, even if a hash is
available too; else use the hash.

Link: https://lore.kernel.org/r/20200120223201.241390-6-ebiggers@kernel.org


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

fs/ubifs/dir.c

+1 −3
Original line number Diff line number Diff line
@@ -225,9 +225,7 @@ static struct dentry *ubifs_lookup(struct inode *dir, struct dentry *dentry, 
		goto done;

	}



	if (nm.hash) {

		ubifs_assert(c, fname_len(&nm) == 0);

		ubifs_assert(c, fname_name(&nm) == NULL);

	if (fname_name(&nm) == NULL) {

		if (nm.hash & ~UBIFS_S_KEY_HASH_MASK)

			goto done; /* ENOENT */

		dent_key_init_hash(c, &key, dir->i_ino, nm.hash);

fs/ubifs/journal.c

+2 −2
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir, 


	if (!xent) {

		dent->ch.node_type = UBIFS_DENT_NODE;

		if (nm->hash)

		if (fname_name(nm) == NULL)

			dent_key_init_hash(c, &dent_key, dir->i_ino, nm->hash);

		else

			dent_key_init(c, &dent_key, dir->i_ino, nm);
@@ -646,7 +646,7 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir, 
	ubifs_add_auth_dirt(c, lnum);



	if (deletion) {

		if (nm->hash)

		if (fname_name(nm) == NULL)

			err = ubifs_tnc_remove_dh(c, &dent_key, nm->minor_hash);

		else

			err = ubifs_tnc_remove_nm(c, &dent_key, nm);

fs/ubifs/key.h

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ static inline void dent_key_init(const struct ubifs_info *c, 
	uint32_t hash = c->key_hash(fname_name(nm), fname_len(nm));



	ubifs_assert(c, !(hash & ~UBIFS_S_KEY_HASH_MASK));

	ubifs_assert(c, !nm->hash && !nm->minor_hash);

	key->u32[0] = inum;

	key->u32[1] = hash | (UBIFS_DENT_KEY << UBIFS_S_KEY_HASH_BITS);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE