From: Richard Weinberger <richard@nod.at>
Date: Wed, 17 May 2017 08:36:47 +0000 (+0200)
Subject: ubifs: Add assert to dent_key_init()
X-Git-Tag: MMI-PSA29.97-13-9~5137^2~10
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8b2900c01716077a42dbb44c691849ab694fa062;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ubifs: Add assert to dent_key_init()

...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>
---

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);
 }