Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc371a25 authored by Roel Kluin's avatar Roel Kluin Committed by David Woodhouse
Browse files

[JFFS2] jffs2_acl_count() tests < 0 on unsigned 



size_t s is unsigned and cannot be less than 0.

Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent a4b6d516

fs/jffs2/acl.c

+2 −2
Original line number Diff line number Diff line
@@ -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;