summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@ZenIV.linux.org.uk>2012-03-22 21:59:52 +0000
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-22 15:10:43 -0700
commitf132c5be05e407a99cf582347a2ae0120acd3ad7 (patch)
treef089bbd244aad5d5686360080f93ee9e8592a39d /fs
parentba331d5decbfe1cc8b1bf10fb7005f4b972c4f0e (diff)
downloadlinux-f132c5be05e407a99cf582347a2ae0120acd3ad7.tar.bz2
Fix full_name_hash() behaviour when length is a multiple of 8
We want it to match what hash_name() is doing, which means extra multiply by 9 in this case... Reported-and-Tested-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/namei.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namei.c b/fs/namei.c
index a94a7f9a03ea..bd313d680d34 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1439,10 +1439,10 @@ unsigned int full_name_hash(const unsigned char *name, unsigned int len)
for (;;) {
a = *(unsigned long *)name;
- hash *= 9;
if (len < sizeof(unsigned long))
break;
hash += a;
+ hash *= 9;
name += sizeof(unsigned long);
len -= sizeof(unsigned long);
if (!len)