evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fs/hfs/catalog.c: fix comparison bug in hfs_cat_keycmp

Browse source 
Relying on the sign (after casting to int) of the difference of two
quantities for comparison is usually wrong.  For example, should a-b
turn out to be 2^31, the return value of cmp(a,b) is -2^31; but that
would also be the return value from cmp(b, a).  So a compares less than
b and b compares less than a.  One can also easily find three values
a,b,c such that a compares less than b, b compares less than c, but a
does not compare less than c.

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Reviewed-by: Vyacheslav Dubeyko <slava@dubeyko.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Rasmus Villemoes 2014-12-10 15:54:37 -08:00 • committed by Linus Torvalds
parent 705304a863
commit ddbc22e27e
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fs/hfs/catalog.c
View file

@ -162,14 +162,16 @@ err2:
*/ */
int hfs_cat_keycmp(const btree_key *key1, const btree_key *key2) int hfs_cat_keycmp(const btree_key *key1, const btree_key *key2)
{ {
int retval; __be32 k1p, k2p;
retval = be32_to_cpu(key1->cat.ParID) - be32_to_cpu(key2->cat.ParID); k1p = key1->cat.ParID;
if (!retval) k2p = key2->cat.ParID;
retval = hfs_strcmp(key1->cat.CName.name, key1->cat.CName.len,
key2->cat.CName.name, key2->cat.CName.len);
return retval; if (k1p != k2p)
return be32_to_cpu(k1p) < be32_to_cpu(k2p) ? -1 : 1;
return hfs_strcmp(key1->cat.CName.name, key1->cat.CName.len,
key2->cat.CName.name, key2->cat.CName.len);
} }
/* Try to get a catalog entry for given catalog id */ /* Try to get a catalog entry for given catalog id */