From patchwork Sun Mar 1 20:35:28 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: jffs2_acl_count() tests < 0 on unsigned Date: Sun, 01 Mar 2009 10:35:28 -0000 From: roel kluin X-Patchwork-Id: 23915 Message-Id: <49AAF190.6050404@gmail.com> To: dwmw2@infradead.org Cc: Andrew Morton , linux-mtd@lists.infradead.org This patch wasn't tested in any way. ------------------------------>8-------------8<--------------------------------- size_t s is unsigned and cannot be less than 0. Signed-off-by: Roel Kluin --- diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c index d987137..6e63e8b 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;