Skip to contentSkip to conversation

Patch "ubifs: Fix assertion in layout_in_gaps()" has been added to the 4.7-stable tree

PATCH [email protected] 1 participant 1 message Sep 12, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ubifs: Fix assertion in layout_in_gaps()

to the 4.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
ubifs-fix-assertion-in-layout_in_gaps.patch
and it can be found in the queue-4.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From c0082e985fdf77b02fc9e0dac3b58504dcf11b7a Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= <[email protected]>
Date: Fri, 12 Aug 2016 15:26:30 +0200
Subject: ubifs: Fix assertion in layout_in_gaps()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Vincent Stehlé <[email protected]>

commit c0082e985fdf77b02fc9e0dac3b58504dcf11b7a upstream.

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 1e51764a3c2ac05a ("UBIFS: add new flash file system")
Cc Artem Bityutskiy <[email protected]>
---
 fs/ubifs/tnc_commit.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ubifs/tnc_commit.c +1 -1
@@ -370,7 +370,7 @@ static int layout_in_gaps(struct ubifs_i
 
 	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;

Patches currently in stable-queue which might be from [email protected] are

queue-4.7/ubifs-fix-assertion-in-layout_in_gaps.patch