[PATCH 16/24] ubifs: Make r5 hash binary string aware

From: Richard Weinberger
Date: Thu Dec 01 2016 - 16:24:46 EST


As of now all filenames known by UBIFS are strings with a NUL
terminator. With encrypted filenames a filename can be any binary
string and the r5 function cannot search for the NUL terminator.
UBIFS always knows how long a filename is, therefore we can change
the hash function to iterate over the filename length to work
correctly with binary strings.

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

diff --git a/fs/ubifs/key.h b/fs/ubifs/key.h
index c0a95e393347..ca4371fdfa7d 100644
--- a/fs/ubifs/key.h
+++ b/fs/ubifs/key.h
@@ -69,7 +69,7 @@ static inline uint32_t key_r5_hash(const char *s, int len)
uint32_t a = 0;
const signed char *str = (const signed char *)s;

- while (*str) {
+ while (len--) {
a += *str << 4;
a += *str >> 4;
a *= 11;
--
2.7.3