From 4ab25ac8b2b5514151d5f91cf9514df08dd26938 Mon Sep 17 00:00:00 2001

From: Richard Weinberger <richard@nod.at>

Date: Sun, 19 Jan 2020 22:52:33 +0100

Subject: [PATCH] ubifs: Fix ubifs_tnc_lookup() usage in do_kill_orphans()

Mime-version: 1.0

Content-type: text/plain; charset=UTF-8

Content-transfer-encoding: 8bit

Git-commit: 4ab25ac8b2b5514151d5f91cf9514df08dd26938

Patch-mainline: v5.7-rc1

References: bsc#1182454

Orphans are allowed to point to deleted inodes.

So -ENOENT is not a fatal error.

Reported-by: Кочетков Максим <fido_max@inbox.ru>

Reported-and-tested-by: "Christian Berger" <Christian.Berger@de.bosch.com>

Tested-by: Karl Olsen <karl@micro-technic.com>

Tested-by: Jef Driesen <jef.driesen@niko.eu>

Fixes: ee1438ce5dc4 ("ubifs: Check link count of inodes when killing orphans.")

Signed-off-by: Richard Weinberger <richard@nod.at>

Acked-by: Jan Kara <jack@suse.cz>

---

 fs/ubifs/orphan.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/ubifs/orphan.c b/fs/ubifs/orphan.c

index edf43ddd7dce..7dd740e3692d 100644

--- a/fs/ubifs/orphan.c

+++ b/fs/ubifs/orphan.c

@@ -688,14 +688,14 @@ static int do_kill_orphans(struct ubifs_info *c, struct ubifs_scan_leb *sleb,

 			ino_key_init(c, &key1, inum);

 			err = ubifs_tnc_lookup(c, &key1, ino);

-			if (err)

+			if (err && err != -ENOENT)

 				goto out_free;

 			/*

 			 * Check whether an inode can really get deleted.

 			 * linkat() with O_TMPFILE allows rebirth of an inode.

 			 */

-			if (ino->nlink == 0) {

+			if (err == 0 && ino->nlink == 0) {

 				dbg_rcvry("deleting orphaned inode %lu",

 					  (unsigned long)inum);

-- 

2.26.2