diff options
| author | Roel Kluin <roel.kluin@gmail.com> | 2009-03-04 12:01:41 -0800 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-03-20 13:18:50 +0000 |
| commit | fc371a25eab8816d49c2d322d91b48a11e206018 (patch) | |
| tree | 3883f39b70407c6249eae7ce84a7041750e5e3dc /fs/jffs2 | |
| parent | a4b6d516a6079c6ba8dc97d185371439035a35d0 (diff) | |
| download | linux-fc371a25eab8816d49c2d322d91b48a11e206018.tar.gz linux-fc371a25eab8816d49c2d322d91b48a11e206018.tar.bz2 linux-fc371a25eab8816d49c2d322d91b48a11e206018.zip | |
[JFFS2] jffs2_acl_count() tests < 0 on unsigned
size_t s is unsigned and cannot be less than 0.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'fs/jffs2')
| -rw-r--r-- | fs/jffs2/acl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c index d98713777a1b..6e63e8b41066 100644 --- a/fs/jffs2/acl.c +++ b/fs/jffs2/acl.c @@ -38,12 +38,12 @@ static int jffs2_acl_count(size_t size) size_t s; size -= sizeof(struct jffs2_acl_header); - s = size - 4 * sizeof(struct jffs2_acl_entry_short); - if (s < 0) { + if (size < 4 * sizeof(struct jffs2_acl_entry_short)) { if (size % sizeof(struct jffs2_acl_entry_short)) return -1; return size / sizeof(struct jffs2_acl_entry_short); } else { + s = size - 4 * sizeof(struct jffs2_acl_entry_short); if (s % sizeof(struct jffs2_acl_entry)) return -1; return s / sizeof(struct jffs2_acl_entry) + 4; |