ubifs: Correctly use tnc_next() in search_dh_cookie()

commit bacfa94b08027b9f66ede7044972e3b066766b3e upstream.

Commit c877154d307f fixed an uninitialized variable and optimized
the function to not call tnc_next() in the first iteration of the
loop. While this seemed perfectly legit and wise, it turned out to
be illegal.
If the lookup function does not find an exact match it will rewind
the cursor by 1.
The rewinded cursor will not match the name hash we are looking for
and this results in a spurious -ENOENT.
So we need to move to the next entry in case of an non-exact match,
but not if the match was exact.

While we are here, update the documentation to avoid further confusion.

Cc: Hyunchul Lee <hyc.lee@gmail.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Fixes: c877154d307f ("ubifs: Fix uninitialized variable in search_dh_cookie()")
Fixes: 781f675e2d7e ("ubifs: Fix unlink code wrt. double hash lookups")
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c
index ba3d0e0f86151e533d98fb656910665a0da61e3c..c7828db206bc03d635cac1cd2594c9f0520fe44a 100644 (file)
--- a/fs/ubifs/tnc.c
+++ b/fs/ubifs/tnc.c
@@ -1164,8 +1164,8 @@ static struct ubifs_znode *dirty_cow_bottom_up(struct ubifs_info *c,
  *   o exact match, i.e. the found zero-level znode contains key @key, then %1
  *     is returned and slot number of the matched branch is stored in @n;
  *   o not exact match, which means that zero-level znode does not contain
- *     @key, then %0 is returned and slot number of the closest branch is stored
- *     in @n;
+ *     @key, then %0 is returned and slot number of the closest branch or %-1
+ *     is stored in @n; In this case calling tnc_next() is mandatory.
  *   o @key is so small that it is even less than the lowest key of the
  *     leftmost zero-level node, then %0 is returned and %0 is stored in @n.
  *
@@ -1882,13 +1882,19 @@ int ubifs_tnc_lookup_nm(struct ubifs_info *c, const union ubifs_key *key,
 
 static int search_dh_cookie(struct ubifs_info *c, const union ubifs_key *key,
                            struct ubifs_dent_node *dent, uint32_t cookie,
-                           struct ubifs_znode **zn, int *n)
+                           struct ubifs_znode **zn, int *n, int exact)
 {
        int err;
        struct ubifs_znode *znode = *zn;
        struct ubifs_zbranch *zbr;
        union ubifs_key *dkey;
 
+       if (!exact) {
+               err = tnc_next(c, &znode, n);
+               if (err)
+                       return err;
+       }
+
        for (;;) {
                zbr = &znode->zbranch[*n];
                dkey = &zbr->key;
@@ -1930,7 +1936,7 @@ static int do_lookup_dh(struct ubifs_info *c, const union ubifs_key *key,
        if (unlikely(err < 0))
                goto out_unlock;
 
-       err = search_dh_cookie(c, key, dent, cookie, &znode, &n);
+       err = search_dh_cookie(c, key, dent, cookie, &znode, &n, err);
 
 out_unlock:
        mutex_unlock(&c->tnc_mutex);
@@ -2716,7 +2722,7 @@ int ubifs_tnc_remove_dh(struct ubifs_info *c, const union ubifs_key *key,
                if (unlikely(err < 0))
                        goto out_free;
 
-               err = search_dh_cookie(c, key, dent, cookie, &znode, &n);
+               err = search_dh_cookie(c, key, dent, cookie, &znode, &n, err);
                if (err)
                        goto out_free;
        }