lkml.org 
[lkml]   [2008]   [Sep]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] UBIFS: correct key comparison
    Date
    From: Adrian Hunter <ext-adrian.hunter@nokia.com>

    The comparison was working, but more by accident than design.

    Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>
    ---
    fs/ubifs/tnc_misc.c | 4 ++--
    1 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/fs/ubifs/tnc_misc.c b/fs/ubifs/tnc_misc.c
    index a25c1cc..b48db99 100644
    --- a/fs/ubifs/tnc_misc.c
    +++ b/fs/ubifs/tnc_misc.c
    @@ -480,8 +480,8 @@ int ubifs_tnc_read_node(struct ubifs_info *c, struct ubifs_zbranch *zbr,
    }

    /* Make sure the key of the read node is correct */
    - key_read(c, key, &key1);
    - if (memcmp(node + UBIFS_KEY_OFFSET, &key1, c->key_len)) {
    + key_read(c, node + UBIFS_KEY_OFFSET, &key1);
    + if (!keys_eq(c, key, &key1)) {
    ubifs_err("bad key in node at LEB %d:%d",
    zbr->lnum, zbr->offs);
    dbg_tnc("looked for key %s found node's key %s",
    --
    1.5.4.1


    \
     
     \ /
      Last update: 2008-09-30 09:49    [W:0.022 / U:59.860 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site