From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3B6831798C; Mon, 14 Oct 2024 15:18:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728919080; cv=none; b=U60H9a5XtuBJfzyHaUB5qxAbtDNKcfq1oPhjW1FrGAjBZLngmGEFCOz54+ibXH/UlAw9mqocSeZQxmAYuOGCp4C0j/dE6FmOFNqLvWDo1yomgLMXaiXngftgNyFTPgemHdiCvoONvtaCSN59WZ7sPMQW0H3ejGZ8CTyBm/AhRzs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728919080; c=relaxed/simple; bh=pKjCJ0Mwygk+g58UhYG6qfNKe2HiltY9rN8J4T0O2aY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ewW++eTMz3jXXV3uWyU+rXC5jyvmgBy7zCpgMu5DKSegqu0D7idMjp1Mu36vf7nstM1eWY/0OFcIup5kySnw4CrvZ2Gmt5+89jr5QV1+aP9pCz9QD0UGEQzB4RxrO2ozMJ84K76YjmlXLK9jNbGFvaE3vh6TLyTBYBOQRG1qbfY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hozjW5o7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="hozjW5o7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC628C4CEC3; Mon, 14 Oct 2024 15:17:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728919080; bh=pKjCJ0Mwygk+g58UhYG6qfNKe2HiltY9rN8J4T0O2aY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hozjW5o7SLZSdUQSEww1CVOhYWfgN28V7LKnjn1ykR0NaQ7XgdDbYXBaEcPfpOLhf 1K/WO7yLwRRYCno99aOUE4WJMSlqKCVClBPUTY+bBFCc2j/Lg0CBgs4kIjIXcjnZ3H b9sZursxzDGqAJa1G3RVxTcr9WUON1E3L6gaVLbk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Ritesh Harjani (IBM)" , Mikhail Ukhin , Artem Sadovnikov , Theodore Tso , Sasha Levin Subject: [PATCH 6.1 508/798] ext4: fix i_data_sem unlock order in ext4_ind_migrate() Date: Mon, 14 Oct 2024 16:17:42 +0200 Message-ID: <20241014141237.938162230@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241014141217.941104064@linuxfoundation.org> References: <20241014141217.941104064@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Artem Sadovnikov [ Upstream commit cc749e61c011c255d81b192a822db650c68b313f ] Fuzzing reports a possible deadlock in jbd2_log_wait_commit. This issue is triggered when an EXT4_IOC_MIGRATE ioctl is set to require synchronous updates because the file descriptor is opened with O_SYNC. This can lead to the jbd2_journal_stop() function calling jbd2_might_wait_for_commit(), potentially causing a deadlock if the EXT4_IOC_MIGRATE call races with a write(2) system call. This problem only arises when CONFIG_PROVE_LOCKING is enabled. In this case, the jbd2_might_wait_for_commit macro locks jbd2_handle in the jbd2_journal_stop function while i_data_sem is locked. This triggers lockdep because the jbd2_journal_start function might also lock the same jbd2_handle simultaneously. Found by Linux Verification Center (linuxtesting.org) with syzkaller. Reviewed-by: Ritesh Harjani (IBM) Co-developed-by: Mikhail Ukhin Signed-off-by: Mikhail Ukhin Signed-off-by: Artem Sadovnikov Rule: add Link: https://lore.kernel.org/stable/20240404095000.5872-1-mish.uxin2012%40yandex.ru Link: https://patch.msgid.link/20240829152210.2754-1-ancowi69@gmail.com Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/migrate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/migrate.c b/fs/ext4/migrate.c index a19a9661646eb..0be0467ae6dd2 100644 --- a/fs/ext4/migrate.c +++ b/fs/ext4/migrate.c @@ -662,8 +662,8 @@ int ext4_ind_migrate(struct inode *inode) if (unlikely(ret2 && !ret)) ret = ret2; errout: - ext4_journal_stop(handle); up_write(&EXT4_I(inode)->i_data_sem); + ext4_journal_stop(handle); out_unlock: percpu_up_write(&sbi->s_writepages_rwsem); return ret; -- 2.43.0