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

Commit f4f61d2c authored by Richard Weinberger's avatar Richard Weinberger
Browse files

ubifs: Implement encrypted filenames 



Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarDavid Gstir <david@sigma-star.at>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent b9bc8c7b

fs/ubifs/debug.c

+7 −7
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static void dump_ch(const struct ubifs_ch *ch) 
void ubifs_dump_inode(struct ubifs_info *c, const struct inode *inode)

{

	const struct ubifs_inode *ui = ubifs_inode(inode);

	struct qstr nm = { .name = NULL };

	struct fscrypt_name nm = {0};

	union ubifs_key key;

	struct ubifs_dent_node *dent, *pdent = NULL;

	int count = 2;
@@ -289,8 +289,8 @@ void ubifs_dump_inode(struct ubifs_info *c, const struct inode *inode) 
		pr_err("\t%d: %s (%s)\n",

		       count++, dent->name, get_dent_type(dent->type));



		nm.name = dent->name;

		nm.len = le16_to_cpu(dent->nlen);

		fname_name(&nm) = dent->name;

		fname_len(&nm) = le16_to_cpu(dent->nlen);

		kfree(pdent);

		pdent = dent;

		key_read(c, &dent->key, &key);
@@ -1107,7 +1107,7 @@ int dbg_check_dir(struct ubifs_info *c, const struct inode *dir) 
	unsigned int nlink = 2;

	union ubifs_key key;

	struct ubifs_dent_node *dent, *pdent = NULL;

	struct qstr nm = { .name = NULL };

	struct fscrypt_name nm = {0};

	loff_t size = UBIFS_INO_NODE_SZ;



	if (!dbg_is_chk_gen(c))
@@ -1128,9 +1128,9 @@ int dbg_check_dir(struct ubifs_info *c, const struct inode *dir) 
			return err;

		}



		nm.name = dent->name;

		nm.len = le16_to_cpu(dent->nlen);

		size += CALC_DENT_SIZE(nm.len);

		fname_name(&nm) = dent->name;

		fname_len(&nm) = le16_to_cpu(dent->nlen);

		size += CALC_DENT_SIZE(fname_len(&nm));

		if (dent->type == UBIFS_ITYPE_DIR)

			nlink += 1;

		kfree(pdent);

fs/ubifs/dir.c

+265 −58

File changed.

Preview size limit exceeded, changes collapsed.

fs/ubifs/journal.c

+63 −60

File changed.

Preview size limit exceeded, changes collapsed.

fs/ubifs/key.h

+10 −9
Original line number Diff line number Diff line
@@ -153,13 +153,13 @@ static inline void highest_ino_key(const struct ubifs_info *c, 
 * @c: UBIFS file-system description object

 * @key: key to initialize

 * @inum: parent inode number

 * @nm: direntry name and length

 * @nm: direntry name and length. Not a string when encrypted!

 */

static inline void dent_key_init(const struct ubifs_info *c,

				 union ubifs_key *key, ino_t inum,

				 const struct qstr *nm)

				 const struct fscrypt_name *nm)

{

	uint32_t hash = c->key_hash(nm->name, nm->len);

	uint32_t hash = c->key_hash(fname_name(nm), fname_len(nm));



	ubifs_assert(!(hash & ~UBIFS_S_KEY_HASH_MASK));

	key->u32[0] = inum;
@@ -191,10 +191,11 @@ static inline void dent_key_init_hash(const struct ubifs_info *c, 
 * @nm: direntry name and length

 */

static inline void dent_key_init_flash(const struct ubifs_info *c, void *k,

				       ino_t inum, const struct qstr *nm)

				       ino_t inum,

				       const struct fscrypt_name *nm)

{

	union ubifs_key *key = k;

	uint32_t hash = c->key_hash(nm->name, nm->len);

	uint32_t hash = c->key_hash(fname_name(nm), fname_len(nm));



	ubifs_assert(!(hash & ~UBIFS_S_KEY_HASH_MASK));

	key->j32[0] = cpu_to_le32(inum);
@@ -225,9 +226,9 @@ static inline void lowest_dent_key(const struct ubifs_info *c, 
 */

static inline void xent_key_init(const struct ubifs_info *c,

				 union ubifs_key *key, ino_t inum,

				 const struct qstr *nm)

				 const struct fscrypt_name *nm)

{

	uint32_t hash = c->key_hash(nm->name, nm->len);

	uint32_t hash = c->key_hash(fname_name(nm), fname_len(nm));



	ubifs_assert(!(hash & ~UBIFS_S_KEY_HASH_MASK));

	key->u32[0] = inum;
@@ -242,10 +243,10 @@ static inline void xent_key_init(const struct ubifs_info *c, 
 * @nm: extended attribute entry name and length

 */

static inline void xent_key_init_flash(const struct ubifs_info *c, void *k,

				       ino_t inum, const struct qstr *nm)

				       ino_t inum, const struct fscrypt_name *nm)

{

	union ubifs_key *key = k;

	uint32_t hash = c->key_hash(nm->name, nm->len);

	uint32_t hash = c->key_hash(fname_name(nm), fname_len(nm));



	ubifs_assert(!(hash & ~UBIFS_S_KEY_HASH_MASK));

	key->j32[0] = cpu_to_le32(inum);

fs/ubifs/replay.c

+4 −4
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ struct replay_entry { 
	struct list_head list;

	union ubifs_key key;

	union {

		struct qstr nm;

		struct fscrypt_name nm;

		struct {

			loff_t old_size;

			loff_t new_size;
@@ -327,7 +327,7 @@ static void destroy_replay_list(struct ubifs_info *c) 


	list_for_each_entry_safe(r, tmp, &c->replay_list, list) {

		if (is_hash_key(c, &r->key))

			kfree(r->nm.name);

			kfree(fname_name(&r->nm));

		list_del(&r->list);

		kfree(r);

	}
@@ -430,10 +430,10 @@ static int insert_dent(struct ubifs_info *c, int lnum, int offs, int len, 
	r->deletion = !!deletion;

	r->sqnum = sqnum;

	key_copy(c, key, &r->key);

	r->nm.len = nlen;

	fname_len(&r->nm) = nlen;

	memcpy(nbuf, name, nlen);

	nbuf[nlen] = '\0';

	r->nm.name = nbuf;

	fname_name(&r->nm) = nbuf;



	list_add_tail(&r->list, &c->replay_list);

	return 0;