From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (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 1703D346A0A for ; Thu, 2 Jul 2026 09:05:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782983120; cv=none; b=H1+sasRuxDFuF4HxQ9b1KYEJLFr0X2yZTd+QqnczF36NZdVpiSe1rtudZTGuCkbCqoZ6o2x5BBPkckqh2ENECWOpXERXIDAX1dNQctare9igcQGBodAw6xyx0SuEhYnqQWGE5K2hQAHMyhsBYQowfSeK9Uoy31DWhBdXBwtstgU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782983120; c=relaxed/simple; bh=z9sSS6tsKQyOYNXwp2CjAyC141FIigl+nIIpfsWFryY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YYqK7qIeKmPN+qWqgoFUEu6Fk2yHvIcyjDNOqrVUHb2N5wBIWgQmg67qw3smQZxN/Rm2rYd8QTYAANf+mCB3prgL+MiXp5CmeBZnjgzQH7aXDWD9874ATI77XRvNp/i/VE242+CzOCwfWijydH4veoatTTCKcz2AC+vAMW3uRrY= 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=WiW1MBEO; arc=none smtp.client-ip=209.85.216.42 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="WiW1MBEO" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-37d70036426so1029011a91.3 for ; Thu, 02 Jul 2026 02:05:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782983118; x=1783587918; 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=Q+C54p5Ymr/bpJsR5kkPFExyrn14Aop0wKq7d6xuByU=; b=WiW1MBEO9DFAlw+jYrupwXB5NwEJIqqRvWeTpSwNaednbaghoA0ux5b90mMTkux1GP BJxnRGLTZ5Yul21PelDAZ+Hr4F0exaveJxAfFjVBHKSNC3d+CQTXejOopNi80uIxaMb9 7wTL5x5Mz2BqzyczFx/+1LGGA79nMD3xf1Gfnv8lDbfKMlB7hpCvuKc9uwMbthnTmgVi 8FkoRhIPtaa47dENUZLn4mZzvU/pciQQEmJcCmwb38/Elcn9ECeZaLq/FvNUDHU8M+wp 6VxFqg2WPSrX3cUXlwPSWKY1MPaHhbVIduSaRCfI4KqGWAP14Ruwxwa1EfDotOoWPtSC OnIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782983118; x=1783587918; 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=Q+C54p5Ymr/bpJsR5kkPFExyrn14Aop0wKq7d6xuByU=; b=hYSsSwhT8+ZXGWQB4Q5SCb7uyJl5rpMpOOAdlh1YYkaCyF8K1hCrGAGniIaiieUgUF 1voc+fJhGDCuHXBA7J7K7o7qUX7RjE55iTlb342iIEjb55aveRY/ueMJFgF68zm4yDCd 3IBvWWQY8aHJtvKVR3V2+O8PKDioLz1qsPczy6Kqd/XkOIwcx6tVnM65RvEcFVfTQcug YJ4GVBpO89Sq9s7HvfJ3ROAItY3UpIZwjkU5KztyXLjeHZ+sKwxCW6oP4dNg7XCWFhaB +zip7Y+vP4sSJ4It3TGL4U27OXuKMjR03G0EchoLYZw+GJPvdmI9uu5HFt9McZbJA6MU 0lWA== X-Forwarded-Encrypted: i=1; AHgh+RoowAQEr3U50g50WqmHtrPSO/UTCKAQJyFqsU7TXmuUs7Wv8Qbmq9QNdX+GvkyAMdAQtr6mIgdDlnVkeyg=@vger.kernel.org X-Gm-Message-State: AOJu0YxhDgbe3Kvum+ggabXfopYz3jdEVo3Ac/CAXJdFY7QbnOVHQC+t CMEDvkqUKjvjB07kn9P1e6m0/zatjCTHqQBrf7f3cb2VmItNjfIr533S9Lh1DutM X-Gm-Gg: AfdE7ck93S+wFsAn+yngXt51+dpCVT+DE9DrTVK1lrSbJk58pI8cY4YPlXoMxizAUzp /AkDmr/X+Uc2rQMV3+MpQ91W8gBg1m/GdAx/rzhjxdqEPfXgH2i3hVy85WAHis8ZmUREcthAwS3 NtPMQYpafj2Lgg1xt5uV4BryHNYF9JbhGu/s28nAmKACNWwCSorRy/bdw2uxuCMgbM5KzIyHkDp +wej1Njn/JiMf3aZit6fjPgW1kvlO9EnWdJMWkp65ra1+HPkQAqEbNX5+JRKssuAtpBb/FtrYlL eM67eWfQtTaN9J3LTzgU+RaBWt9dVWfkdsLa6FOP6BDNKzUf56BJ9Ne+yYED7hCvSRjp+ZdyyVq puP7cHsDhdAFGppinkJsxuKUFr/i9bF/g8HB8JDWV1dSW9t5nDy/+e6cgOub8ZYaed6EjAp6vRZ MTWIzLcPi7hf4tnR0appFHWouc X-Received: by 2002:a17:90b:3a47:b0:37e:2005:6507 with SMTP id 98e67ed59e1d1-380ba84865cmr4227283a91.15.1782983117993; Thu, 02 Jul 2026 02:05:17 -0700 (PDT) Received: from ustb520lab-MS-7E07.. ([123.124.147.27]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-380d830884esm528583a91.2.2026.07.02.02.05.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2026 02:05:17 -0700 (PDT) From: Jiaming Zhang To: joseph.qi@linux.alibaba.com Cc: jlbec@evilplan.org, linux-kernel@vger.kernel.org, mark@fasheh.com, ocfs2-devel@lists.linux.dev, r772577952@gmail.com, syzkaller@googlegroups.com Subject: [PATCH v2] ocfs2: fix hung task in orphan recovery Date: Thu, 2 Jul 2026 17:05:07 +0800 Message-ID: <20260702090507.446517-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 --- Changes in v2: - Propagate the actual error from ocfs2_empty_dir() to caller. - Update ocfs2_unlink() and ocfs2_rename() to distinguish errors from a non-empty directory result. fs/ocfs2/dir.c | 20 ++++++++++++++------ fs/ocfs2/namei.c | 11 ++++++++--- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c index 8e6b03238327..baf3eca7b4e4 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; 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; } @@ -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); } /* @@ -2167,7 +2171,7 @@ static int ocfs2_empty_dir_dx(struct inode *inode, /* * routine to check that the specified directory is empty (for rmdir) * - * Returns 1 if dir is empty, zero otherwise. + * Returns 1 if dir is empty, zero if not, and a negative errno on error. * * XXX: This is a performance problem for unindexed directories. */ @@ -2180,8 +2184,10 @@ int ocfs2_empty_dir(struct inode *inode) if (ocfs2_dir_indexed(inode)) { ret = ocfs2_empty_dir_dx(inode, &priv); - if (ret) + if (ret) { mlog_errno(ret); + return ret; + } /* * We still run ocfs2_dir_foreach to get the checks * for "." and "..". @@ -2189,8 +2195,10 @@ int ocfs2_empty_dir(struct inode *inode) } ret = ocfs2_dir_foreach(inode, &priv.ctx); - if (ret) + if (ret) { mlog_errno(ret); + return ret; + } if (!priv.seen_dot || !priv.seen_dot_dot) { mlog(ML_ERROR, "bad directory (dir #%llu) - no `.' or `..'\n", diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index 1277666c77cd..abce59e1f180 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c @@ -945,7 +945,10 @@ static int ocfs2_unlink(struct inode *dir, child_locked = 1; if (S_ISDIR(inode->i_mode)) { - if (inode->i_nlink != 2 || !ocfs2_empty_dir(inode)) { + status = ocfs2_empty_dir(inode); + if (status < 0) + goto leave; + if (inode->i_nlink != 2 || !status) { status = -ENOTEMPTY; goto leave; } @@ -1499,8 +1502,10 @@ static int ocfs2_rename(struct mnt_idmap *idmap, if (target_exists) { if (S_ISDIR(new_inode->i_mode)) { - if (new_inode->i_nlink != 2 || - !ocfs2_empty_dir(new_inode)) { + status = ocfs2_empty_dir(new_inode); + if (status < 0) + goto bail; + if (new_inode->i_nlink != 2 || !status) { status = -ENOTEMPTY; goto bail; } -- 2.43.0