fuse: revalidate: don't invalidate if interrupted

Miklos Szeredi · Miklos Szeredi · commit a9d1c4c6df0e · 2023-06-07T17:49:20.000+02:00
If the LOOKUP request triggered from fuse_dentry_revalidate() is interrupted, then the dentry will be invalidated, possibly resulting in submounts being unmounted. Reported-by: Xu Rongbo <xurongbo@baidu.com> Closes: https://lore.kernel.org/all/CAJfpegswN_CJJ6C3RZiaK6rpFmNyWmXfaEpnQUJ42KCwNF5tWw@mail.gmail.com/ Fixes: 9e6268d ("[PATCH] FUSE - read-write operations") Cc: <stable@vger.kernel.org> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
@@ -258,7 +258,7 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags)
 			spin_unlock(&fi->lock);
 		}
 		kfree(forget);
-		if (ret == -ENOMEM)
+		if (ret == -ENOMEM || ret == -EINTR)
 			goto out;
 		if (ret || fuse_invalid_attr(&outarg.attr) ||
 		    fuse_stale_inode(inode, outarg.generation, &outarg.attr))

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags)`
`258`	`258`	`spin_unlock(&fi->lock);`
`259`	`259`	`}`
`260`	`260`	`kfree(forget);`
`261`		`- if (ret == -ENOMEM)`
	`261`	`+ if (ret == -ENOMEM \|\| ret == -EINTR)`
`262`	`262`	`goto out;`
`263`	`263`	`if (ret \|\| fuse_invalid_attr(&outarg.attr) \|\|`
`264`	`264`	`fuse_stale_inode(inode, outarg.generation, &outarg.attr))`