openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

fs/affs: use unsigned int for string lengths 

- Some min() were used with different types.

- Create a new variable in __affs_hash_dentry() to process
  affs_check_name()/min() return

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Fabian Frederick 2015-02-17 13:46:20 -08:00 committed by Linus Torvalds
parent 4d29e571e1
commit eeb36f8e93
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/affs/amigaffs.c
View File

@ -508,7 +508,7 @@ affs_check_name(const unsigned char *name, int len, bool notruncate)
int int
affs_copy_name(unsigned char *bstr, struct dentry *dentry) affs_copy_name(unsigned char *bstr, struct dentry *dentry)
{ {
int len = min(dentry->d_name.len, 30u); u32 len = min(dentry->d_name.len, 30u);
*bstr++ = len; *bstr++ = len;
memcpy(bstr, dentry->d_name.name, len); memcpy(bstr, dentry->d_name.name, len);

15
fs/affs/namei.c
View File

@ -64,15 +64,16 @@ __affs_hash_dentry(struct qstr *qstr, toupper_t toupper, bool notruncate)
{ {
const u8 *name = qstr->name; const u8 *name = qstr->name;
unsigned long hash; unsigned long hash;
int i; int retval;
u32 len;
i = affs_check_name(qstr->name, qstr->len, notruncate); retval = affs_check_name(qstr->name, qstr->len, notruncate);
if (i) if (retval)
return i; return retval;
hash = init_name_hash(); hash = init_name_hash();
i = min(qstr->len, 30u); len = min(qstr->len, 30u);
for (; i > 0; name++, i--) for (; len > 0; name++, len--)
hash = partial_name_hash(toupper(*name), hash); hash = partial_name_hash(toupper(*name), hash);
qstr->hash = end_name_hash(hash); qstr->hash = end_name_hash(hash);
@ -173,7 +174,7 @@ int
affs_hash_name(struct super_block *sb, const u8 *name, unsigned int len) affs_hash_name(struct super_block *sb, const u8 *name, unsigned int len)
{ {
toupper_t toupper = affs_get_toupper(sb); toupper_t toupper = affs_get_toupper(sb);
int hash; u32 hash;
hash = len = min(len, 30u); hash = len = min(len, 30u);
for (; len > 0; len--) for (; len > 0; len--)