lkml.org 
[lkml]   [2016]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 214/346] ubifs: Fix assertion in layout_in_gaps()
    3.16.39-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Vincent Stehlé <vincent.stehle@intel.com>

    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")
    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>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    fs/ubifs/tnc_commit.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/fs/ubifs/tnc_commit.c
    +++ b/fs/ubifs/tnc_commit.c
    @@ -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;
    \
     
     \ /
      Last update: 2016-11-14 03:31    [W:4.109 / U:1.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site