Re: [PATCH 05/10] mount.fuse: free the options on the service mount return path

["Darrick J. Wong" <djwong@kernel.org>]

On Fri, Sep 25, 2026 at 12:23:33AM +0200, Bernd Schubert via B4 Relay wrote:
> From: Bernd Schubert <bernd@bsbernd.com>
> 
> These leaks were detected by the new tests.
> 
> Assisted-by: LLM
> Signed-off-by: Bernd Schubert <bernd@bsbernd.com>

Looks fine, though those leaks won't live for long...
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

--D

> ---
>  util/mount.fuse.c | 42 ++++++++++++++++++++++++++----------------
>  1 file changed, 26 insertions(+), 16 deletions(-)
> 
> diff --git a/util/mount.fuse.c b/util/mount.fuse.c
> index c67a0c2b7f2f..1414265fd274 100644
> --- a/util/mount.fuse.c
> +++ b/util/mount.fuse.c
> @@ -56,9 +56,7 @@
>  #endif
>  
>  #include "fuse.h"
> -#ifdef HAVE_SERVICEMOUNT
> -# include "mount_service.h"
> -#endif
> +#include "mount_service.h"
>  
>  static char *progname;
>  
> @@ -396,6 +394,18 @@ out:
>  	fuse_opt_free_args(&args);
>  	return ret;
>  }
> +#else
> +static int try_service_main(const char *argv0, const char *fstype,
> +			    const char *source, const char *mountpoint,
> +			    const char *options)
> +{
> +	(void)argv0;
> +	(void)fstype;
> +	(void)source;
> +	(void)mountpoint;
> +	(void)options;
> +	return MOUNT_SERVICE_FALLBACK_NEEDED;
> +}
>  #endif
>  
>  int main(int argc, char *argv[])
> @@ -415,6 +425,7 @@ int main(int argc, char *argv[])
>  	int fuse_fd = 0;
>  	int drop_privileges = 0;
>  	char *dev_fd_mountpoint = NULL;
> +	int ret;
>  
>  	progname = argv[0];
>  	basename = strrchr(argv[0], '/');
> @@ -608,19 +619,17 @@ int main(int argc, char *argv[])
>  	}
>  #endif
>  
> -#ifdef HAVE_SERVICEMOUNT
>  	/*
>  	 * Now that we know the desired filesystem type, see if we can find
>  	 * a socket service implementing that, if we haven't selected any weird
>  	 * options that would prevent that.
>  	 */
>  	if (!pass_fuse_fd && !(setuid_name && setuid_name[0])) {
> -		int ret = try_service_main(argv[0], type, source, mountpoint,
> -					   options);
> +		ret = try_service_main(argv[0], type, source, mountpoint,
> +				       options);
>  		if (ret != MOUNT_SERVICE_FALLBACK_NEEDED)
> -			return ret;
> +			goto out;
>  	}
> -#endif
>  
>  	add_arg(&command, type);
>  	if (source)
> @@ -631,17 +640,18 @@ int main(int argc, char *argv[])
>  		add_arg(&command, options);
>  	}
>  
> +	execl("/bin/sh", "/bin/sh", "-c", command, NULL);
> +	fprintf(stderr, "%s: failed to execute /bin/sh: %s\n", progname,
> +		strerror(errno));
> +	ret = 1;
> +
> +out:
> +	if (pass_fuse_fd)
> +		close(fuse_fd);
>  	free(options);
>  	free(dev_fd_mountpoint);
>  	free(dup_source);
>  	free(setuid_name);
> -
> -	execl("/bin/sh", "/bin/sh", "-c", command, NULL);
> -	fprintf(stderr, "%s: failed to execute /bin/sh: %s\n", progname,
> -		strerror(errno));
> -	
> -	if (pass_fuse_fd)
> -		close(fuse_fd);
>  	free(command);
> -	return 1;
> +	return ret;
>  }
> 
> -- 
> 2.53.0
> 
> 
>