lkml.org 
[lkml]   [2018]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.14 035/161] ubifs: Fix uninitialized variable in search_dh_cookie()
    Date
    From: Geert Uytterhoeven <geert@linux-m68k.org>

    [ Upstream commit c877154d307f4a91e0b5b85b75535713dab945ae ]

    fs/ubifs/tnc.c: In function ‘search_dh_cookie’:
    fs/ubifs/tnc.c:1893: warning: ‘err’ is used uninitialized in this function

    Indeed, err is always used uninitialized.

    According to an original review comment from Hyunchul, acknowledged by
    Richard, err should be initialized to -ENOENT to avoid the first call to
    tnc_next(). But we can achieve the same by reordering the code.

    Fixes: 781f675e2d7e ("ubifs: Fix unlink code wrt. double hash lookups")
    Reported-by: Hyunchul Lee <hyc.lee@gmail.com>
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Richard Weinberger <richard@nod.at>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    fs/ubifs/tnc.c | 21 +++++++--------------
    1 file changed, 7 insertions(+), 14 deletions(-)

    diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c
    index 0a213dcba2a1..ba3d0e0f8615 100644
    --- a/fs/ubifs/tnc.c
    +++ b/fs/ubifs/tnc.c
    @@ -1890,35 +1890,28 @@ static int search_dh_cookie(struct ubifs_info *c, const union ubifs_key *key,
    union ubifs_key *dkey;

    for (;;) {
    - if (!err) {
    - err = tnc_next(c, &znode, n);
    - if (err)
    - goto out;
    - }
    -
    zbr = &znode->zbranch[*n];
    dkey = &zbr->key;

    if (key_inum(c, dkey) != key_inum(c, key) ||
    key_type(c, dkey) != key_type(c, key)) {
    - err = -ENOENT;
    - goto out;
    + return -ENOENT;
    }

    err = tnc_read_hashed_node(c, zbr, dent);
    if (err)
    - goto out;
    + return err;

    if (key_hash(c, key) == key_hash(c, dkey) &&
    le32_to_cpu(dent->cookie) == cookie) {
    *zn = znode;
    - goto out;
    + return 0;
    }
    - }
    -
    -out:

    - return err;
    + err = tnc_next(c, &znode, n);
    + if (err)
    + return err;
    + }
    }

    static int do_lookup_dh(struct ubifs_info *c, const union ubifs_key *key,
    --
    2.15.1
    \
     
     \ /
      Last update: 2018-04-09 02:23    [W:2.889 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site