aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorVincent Stehlé <vincent.stehle@intel.com>2016-08-12 15:26:30 +0200
committerRichard Weinberger <richard@nod.at>2016-08-23 23:02:40 +0200
commitc0082e985fdf77b02fc9e0dac3b58504dcf11b7a (patch)
treeb14fae90c71b66f98072597d31945c3d2b59070f /fs
parent7a1dcf6adaa7cc4b8cd93a3883267497a77b1051 (diff)
downloadlinux-yocto-4.8-c0082e985fdf77b02fc9e0dac3b58504dcf11b7a.tar.gz
linux-yocto-4.8-c0082e985fdf77b02fc9e0dac3b58504dcf11b7a.tar.bz2
linux-yocto-4.8-c0082e985fdf77b02fc9e0dac3b58504dcf11b7a.zip
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: 1e51764a3c2ac05a ("UBIFS: add new flash file system") Cc: <stable@vger.kernel.org> Signed-off-by: Vincent Stehlé <vincent.stehle@intel.com> Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'fs')
-rw-r--r--fs/ubifs/tnc_commit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/tnc_commit.c b/fs/ubifs/tnc_commit.c
index b45345d701e7..51157da3f76e 100644
--- a/fs/ubifs/tnc_commit.c
+++ b/fs/ubifs/tnc_commit.c
@@ -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;