Commit 204aa22a authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

fuse: abort on fatal signal during sync init 



When sync init is used and the server exits for some reason (error, crash)
while processing FUSE_INIT, the filesystem creation will hang.  The reason
is that while all other threads will exit, the mounting thread (or process)
will keep the device fd open, which will prevent an abort from happening.

This is a regression from the async mount case, where the mount was done
first, and the FUSE_INIT processing afterwards, in which case there's no
such recursive syscall keeping the fd open.

Fixes: dfb84c33 ("fuse: allow synchronous FUSE_INIT")
Cc: stable@vger.kernel.org # v6.18
Reviewed-by: default avatarJoanne Koong <joannelkoong@gmail.com>
Reviewed-by: default avatarBernd Schubert <bernd@bsbernd.com>
Reviewed-by: default avatar"Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 5a6baf20

fs/fuse/dev.c

+7 −1
Original line number Diff line number Diff line
@@ -570,6 +570,11 @@ static void request_wait_answer(struct fuse_req *req) 
		if (!err)

			return;



		if (req->args->abort_on_kill) {

			fuse_abort_conn(fc);

			return;

		}



		if (test_bit(FR_URING, &req->flags))

			removed = fuse_uring_remove_pending_req(req);

		else
@@ -676,6 +681,7 @@ ssize_t __fuse_simple_request(struct mnt_idmap *idmap, 
			fuse_force_creds(req);



		__set_bit(FR_WAITING, &req->flags);

		if (!args->abort_on_kill)

			__set_bit(FR_FORCE, &req->flags);

	} else {

		WARN_ON(args->nocreds);

fs/fuse/fuse_i.h

+1 −0
Original line number Diff line number Diff line
@@ -345,6 +345,7 @@ struct fuse_args { 
	bool is_ext:1;

	bool is_pinned:1;

	bool invalidate_vmap:1;

	bool abort_on_kill:1;

	struct fuse_in_arg in_args[4];

	struct fuse_arg out_args[2];

	void (*end)(struct fuse_mount *fm, struct fuse_args *args, int error);

fs/fuse/inode.c

+1 −0
Original line number Diff line number Diff line
@@ -1551,6 +1551,7 @@ int fuse_send_init(struct fuse_mount *fm) 
	int err;



	if (fm->fc->sync_init) {

		ia->args.abort_on_kill = true;

		err = fuse_simple_request(fm, &ia->args);

		/* Ignore size of init reply */

		if (err > 0)