From 438205db6151f874bc5b778a68546ded37f91088 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Wed, 4 Mar 2009 12:01:41 -0800 Subject: [PATCH] --- yaml --- r: 142301 b: refs/heads/master c: fc371a25eab8816d49c2d322d91b48a11e206018 h: refs/heads/master i: 142299: 3088b950a3882710a66000f516ff5ef8ba4435f6 v: v3 --- [refs] | 2 +- trunk/fs/jffs2/acl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 004c5007d5e9..d2c0a01d2267 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4b6d516a6079c6ba8dc97d185371439035a35d0 +refs/heads/master: fc371a25eab8816d49c2d322d91b48a11e206018 diff --git a/trunk/fs/jffs2/acl.c b/trunk/fs/jffs2/acl.c index d98713777a1b..6e63e8b41066 100644 --- a/trunk/fs/jffs2/acl.c +++ b/trunk/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;