From: Ard Biesheuvel <ardb@kernel.org>
Date: Mon, 17 Mar 2025 07:23:11 +0000 (+0100)
Subject: efivarfs: use I_MUTEX_CHILD nested lock to traverse variables on resume
X-Git-Tag: v6.14~19^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dec1277875a5974413068bfb67df7e87e51a189b;p=thirdparty%2Fkernel%2Flinux.git

efivarfs: use I_MUTEX_CHILD nested lock to traverse variables on resume

syzbot warns about a potential deadlock, but this is a false positive
resulting from a missing lockdep annotation: iterate_dir() locks the
parent whereas the inode_lock() it warns about locks the child, which is
guaranteed to be a different lock.

So use inode_lock_nested() instead with the appropriate lock class.

Reported-by: syzbot+019072ad24ab1d948228@syzkaller.appspotmail.com
Suggested-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---

diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c
index 6eae8cf655c12..42295d04f08de 100644
--- a/fs/efivarfs/super.c
+++ b/fs/efivarfs/super.c
@@ -421,7 +421,7 @@ static bool efivarfs_actor(struct dir_context *ctx, const char *name, int len,
 	if (err)
 		size = 0;
 
-	inode_lock(inode);
+	inode_lock_nested(inode, I_MUTEX_CHILD);
 	i_size_write(inode, size);
 	inode_unlock(inode);