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

Commit c0082e98 authored by Vincent Stehlé's avatar Vincent Stehlé Committed by Richard Weinberger
Browse files

ubifs: Fix assertion in layout_in_gaps() 



An assertion in layout_in_gaps() verifies that the gap_lebs pointer is
below the maximum bound. When computing this maximum bound the idx_lebs
count is multiplied by sizeof(int), while C pointers arithmetic does take
into account the size of the pointed elements implicitly already. Remove
the multiplication to fix the assertion.

Fixes: 1e51764a ("UBIFS: add new flash file system")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarVincent Stehlé <vincent.stehle@intel.com>
Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 7a1dcf6a

fs/ubifs/tnc_commit.c

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ static int layout_in_gaps(struct ubifs_info *c, int cnt) 


	p = c->gap_lebs;

	do {

		ubifs_assert(p < c->gap_lebs + sizeof(int) * c->lst.idx_lebs);

		ubifs_assert(p < c->gap_lebs + c->lst.idx_lebs);

		written = layout_leb_in_gaps(c, p);

		if (written < 0) {

			err = written;