Patchwork jffs2_acl_count() tests < 0 on unsigned

login
register
mail settings
Submitter roel kluin
Date March 1, 2009, 8:35 p.m.
Message ID <49AAF190.6050404@gmail.com>
Download mbox | patch
Permalink /patch/23915/
State New, archived
Headers show

Comments

roel kluin - March 1, 2009, 8:35 p.m.
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 <roel.kluin@gmail.com>
---

Patch

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;