From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 847F03F44DC for ; Wed, 1 Jul 2026 09:16:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782897384; cv=none; b=tysAiNAD6pCtqnR4L9CBjW3M6xcYLIkI+8uQVJiouVn8bU7B7cdnwCdp9ecYvz0jOf9QM9YP9KQ9OSfJEEiqeupiCpBkfwyhS0xUi5UzjgILjnBpUEIAK6kD26DrqvrtSdiSstzH7TFSF++m7Zf94sO8ISqQLRAqQoAtv/Oqwpk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782897384; c=relaxed/simple; bh=yprpUvdFEY/+h+aruRnF7kK0pxzCzrhZDe+AdS/ujXc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kuI6hAkK9FkRYt/2Vm+OdlHW4NT9jR66IYg4l3HL3HrhMv2E9kcAPJ/QW0m2QIWqIP8hj79xcjbJMEogPkYK3HhHKt/botwN0XWK+E8vWsmraWdaV3gAtz1slB3sRs30l+4U+Gp4WiuKm6UEHO/3P9PHa5Xu1IhJPXUYKL+8+PI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=qZoRwKpj; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qZoRwKpj" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2c9b125d64cso2347425ad.1 for ; Wed, 01 Jul 2026 02:16:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782897382; x=1783502182; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Wo5Tlo2sCLraoPGeiQYr9vFDTM2pEDEskjKH8yXg0rI=; b=qZoRwKpjPpaPVUiUc0v+0cKTfiKpBBDo8kY1lf5l9lpOiKlJh3LsNkTP7mBmDQXnht tkzCdsbXETzB+d1vnKw1TCPZZ9XqsA9fo2a5B+a8FpHabBIKJPCouyU+N6t77mdBZYkr xkjSUr0wnU1iolfpcHN5V0wn26McT1IkDBVem8G51DiO1j+xT7hbe+dx3yMX8oJ2kZ1H 8DXQCYouPO7nKis4CUPyxcnONvV2xNxvo758lu/e21ZgTuJstOgKkdxVNJACcHLf+TCQ 5VNJrk2A7mBiToExDyZuqybc25OHfgO7sSKXLV0IpFj0kI0vPyk/GN2ho9peORcdQ/nQ yDig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782897382; x=1783502182; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Wo5Tlo2sCLraoPGeiQYr9vFDTM2pEDEskjKH8yXg0rI=; b=N2g1fvIeoxSDskY/dd83RhqK6g6igkZNVWNHEAj04YhF8X5+ITTrRL4kyFPa3qKSe8 BCxWlwgU8tm+LxZH7jXxgrSOzcbsO+kXfkoI0dvcPl6EG+XsE3F1zY/q1Aws6N3WQwm6 0YOs6ccqXTDsw3vatOhSLCRrqNeKcX7IX8LeBa6ZDDzReWIycUkTLdImcGRWuVvYxV5w rUXcgMorMlmbei8isFhnyJKZmamRoJUAFBkM2gWkeIMmkKFSOitgbNHDhaB6AQHjmjAr YGE9P5+TNQ99NM4NQRI+uWuGecoiD6Wk8uEebO8ADNIXwBIQJnj38PGWYt+FGIIvaRqe 02EQ== X-Forwarded-Encrypted: i=1; AHgh+Rrt+l/T/5VY9t0MHlwzhi0N3FYXCS7LXieawU3wDYVYiLyd+odIS30hZ6JNIGdlrTMapZNfKb1t9H0o8bQ=@vger.kernel.org X-Gm-Message-State: AOJu0YznU/3994LR0Kp684WSviJ7/RXzUl8BF8T3IVJaxUqgIeECWOaT XXh1Pgx3NAnSaIAv60XBPz/SVv0dHFDe+oPDqnSFSNSb9bugrJRAkTIZQoJvw1pv X-Gm-Gg: AfdE7cl7MCozV0cQ6b0hCQhHbX2jCkTZfSdVCGerb3u9VyoTblZG1+ptxAFwB0tw68H qjPTp4WO9m6cuAK6FRKkMEw8L1Ad9oE+yNhwz/yaRhNuAmnduaXeTxbrV9GTIHP7jaZQXTmTVME 9HTUuFmqZKDsQiAbleEZaG+u3t6VLWNB04tCR0pFm+bMqtGex1x31q6GcMGdetYxixnE8iD6fNc Jpo3bTRpRaTNIwIS2tG7/PrhRNHnwJvkGTLg3FsVkh6kc+xE09xgI4x+PS1BjQwyjzPYk9en3ZD erPjIsvAS1Ju2SISNXlynV3TrQSrHzyw7folaLz20poOcz4G5H9MnIYfYlCvXWn9UPRnKad65Wp XwhPzAPzv7cAdNZWQ16nUfuK3SvMWnRcFN55pFYlpRbwZQXhB7A51PQKdfAaSLceo0XCd9zsEUC f0Jcw6n+pFAD10tpkZYf01+dZD X-Received: by 2002:a17:902:cf0a:b0:2c1:ee75:56bb with SMTP id d9443c01a7336-2ca7e7000ffmr8856355ad.20.1782897382272; Wed, 01 Jul 2026 02:16:22 -0700 (PDT) Received: from ustb520lab-MS-7E07.. ([123.124.147.27]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ca37c87bb8sm28970185ad.30.2026.07.01.02.16.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2026 02:16:21 -0700 (PDT) From: Jiaming Zhang To: mark@fasheh.com, jlbec@evilplan.org, joseph.qi@linux.alibaba.com Cc: r772577952@gmail.com, linux-kernel@vger.kernel.org, ocfs2-devel@lists.linux.dev, syzkaller@googlegroups.com Subject: [PATCH] ocfs2: fix hung task in orphan recovery Date: Wed, 1 Jul 2026 17:16:13 +0800 Message-ID: <20260701091613.1008755-1-r772577952@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit A crafted OCFS2 image with corrupted orphan-directory extent metadata can make umount hang. During unmount, ocfs2_recovery_disable() waits for the ocfs2_complete_recovery work item to finish. The worker scans the orphan directory through ocfs2_queue_orphans() and ocfs2_dir_foreach(). If ocfs2_read_dir_block() fails on a corrupted directory block, ocfs2_dir_foreach_blk_el() skips the block and continues walking. On a badly corrupted directory this can keep orphan recovery busy for a long time, leaving umount blocked while flushing osb->ocfs2_wq. Return the read error immediately for full directory scans and propagate the error from ocfs2_dir_foreach(). When ocfs2_empty_dir() receives such an error, report the directory as non-empty so unlink/rmdir does not proceed on an unreadable directory. Closes: https://lore.kernel.org/lkml/CANypQFbWH76Y6LWHEwAvTP7aQL04uMJ=dDyL6YDmxa3fv3Tyjg@mail.gmail.com/ Assisted-by: Codex:gpt-5.5-xhigh Signed-off-by: Jiaming Zhang --- fs/ocfs2/dir.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c index 8e6b03238327..9bebf28f4b77 100644 --- a/fs/ocfs2/dir.c +++ b/fs/ocfs2/dir.c @@ -1866,6 +1866,7 @@ static int ocfs2_dir_foreach_blk_el(struct inode *inode, struct super_block * sb = inode->i_sb; unsigned int ra_sectors = 16; int stored = 0; + int ret = 0; bh = NULL; @@ -1873,9 +1874,13 @@ static int ocfs2_dir_foreach_blk_el(struct inode *inode, while (ctx->pos < i_size_read(inode)) { blk = ctx->pos >> sb->s_blocksize_bits; - if (ocfs2_read_dir_block(inode, blk, &bh, 0)) { + ret = ocfs2_read_dir_block(inode, blk, &bh, 0); + if (ret) { + if (persist) + return ret; /* Skip the corrupt dirblock and keep trying */ ctx->pos += sb->s_blocksize - offset; + offset = 0; continue; } @@ -1950,7 +1955,7 @@ static int ocfs2_dir_foreach_blk_el(struct inode *inode, if (!persist && stored) break; } - return 0; + return ret; } static int ocfs2_dir_foreach_blk(struct inode *inode, u64 *f_version, @@ -1969,8 +1974,7 @@ static int ocfs2_dir_foreach_blk(struct inode *inode, u64 *f_version, int ocfs2_dir_foreach(struct inode *inode, struct dir_context *ctx) { u64 version = inode_query_iversion(inode); - ocfs2_dir_foreach_blk(inode, &version, ctx, true); - return 0; + return ocfs2_dir_foreach_blk(inode, &version, ctx, true); } /* @@ -2189,8 +2193,10 @@ int ocfs2_empty_dir(struct inode *inode) } ret = ocfs2_dir_foreach(inode, &priv.ctx); - if (ret) + if (ret) { mlog_errno(ret); + return 0; + } if (!priv.seen_dot || !priv.seen_dot_dot) { mlog(ML_ERROR, "bad directory (dir #%llu) - no `.' or `..'\n", -- 2.43.0