[PATCH 4/6] ubifs: Add assert to dent_key_init()

From	Richard Weinberger <richard@nod.at>
Newsgroups	linux.kernel
Subject	[PATCH 4/6] ubifs: Add assert to dent_key_init()
Date	2017-05-17 10:40 +0200
Message-ID	<tI2EW-J3-27@gated-at.bofh.it> (permalink)
References	<tI2EW-J3-23@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

...to make sure that we don't use it for double hashed lookups
instead of dent_key_init_hash().

Signed-off-by: Richard Weinberger <richard@nod.at>
---
 fs/ubifs/key.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs/ubifs/key.h b/fs/ubifs/key.h
index 7547be512db2..b1f7c0caa3ac 100644
--- a/fs/ubifs/key.h
+++ b/fs/ubifs/key.h
@@ -162,6 +162,7 @@ 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(!(hash & ~UBIFS_S_KEY_HASH_MASK));
+	ubifs_assert(!nm->hash && !nm->minor_hash);
 	key->u32[0] = inum;
 	key->u32[1] = hash | (UBIFS_DENT_KEY << UBIFS_S_KEY_HASH_BITS);
 }
-- 
2.12.0

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 4/6] ubifs: Add assert to dent_key_init() Richard Weinberger <richard@nod.at> - 2017-05-17 10:40 +0200

csiph-web