diff --git a/fs/ubifs/key.h b/fs/ubifs/key.h
index c0a95e393347c4199dbc2057cb838a3b4a4a4ef3..ca4371fdfa7d4607edd5f7cec50a37aeef7c39ad 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;