开源软件构建与测试

_service:tar_scm:fuse3.spec Changed

@@ -2,7 +2,7 @@
 
 Name:    fuse3
 Version: %{fuse3ver}
-Release: 1
+Release: 3
 Summary: User space File System of fuse3
 License: GPL+ and LGPLv2+
 URL:     http://fuse.sf.net
@@ -11,6 +11,8 @@
 
 Patch1:		0001-fix-chown-and-mknod-failed.patch
 Patch2:		0002-revert-fuse_daemonize-chdir-to-even-if-not-run.patch
+Patch3:		0003-fix-missing-fuse_loop_cfg_destroy-in-fuse_session_lo.patch
+Patch4:		0004-add-nullptr-check-in-fuse_session_mount.patch
 
 BuildRequires: libselinux-devel, pkgconfig, systemd-udev, meson, fdupes
 BuildRequires: autoconf, automake, libtool, gettext-devel, ninja-build
@@ -101,6 +103,12 @@
 %{_mandir}/man8/*
 
 %changelog
+* Tue Aug 27 2024 yanshuai <yanshuai01@kylinos.cn> -3.16.2-3
+- Add nullptr check in fuse_session_mount
+
+* Wed Jul 24 2024 kouwenqi <kouwenqi@kylinos.cn> -3.16.2-2
+- Fix missing fuse_loop_cfg_destroy() in fuse_session_loop_mt_31 (#944)
+
 * Tue Jan 30 2024 yangyun <yangyun50@huawei.com> -3.16.2-1
 - upgrade to 3.16.2
 	- fix some issues (see: https://github.com/libfuse/libfuse/releases)

_service:tar_scm:0003-fix-missing-fuse_loop_cfg_destroy-in-fuse_session_lo.patch Added

@@ -0,0 +1,39 @@
+From b701673e7429336248c307c93c2c26f443719255 Mon Sep 17 00:00:00 2001
+From: Bernd Schubert <bernd.schubert@fastmail.fm>
+Date: Sun, 5 May 2024 13:09:56 +0200
+Subject: PATCH Fix missing fuse_loop_cfg_destroy() in
+ fuse_session_loop_mt_31 (#944)
+
+All credits to Miklos Szeredi <miklos@szeredi.hu> for spotting
+this.
+
+Signed-off-by: Bernd Schubert <bernd.schubert@fastmail.fm>
+
+---
+ lib/fuse_loop_mt.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/lib/fuse_loop_mt.c b/lib/fuse_loop_mt.c
+index 0200d73..bfe33ca 100644
+--- a/lib/fuse_loop_mt.c
++++ b/lib/fuse_loop_mt.c
+@@ -419,10 +419,15 @@ int fuse_session_loop_mt_31(struct fuse_session *se, int clone_fd);
+ FUSE_SYMVER("fuse_session_loop_mt_31", "fuse_session_loop_mt@FUSE_3.0")
+ int fuse_session_loop_mt_31(struct fuse_session *se, int clone_fd)
+ {
++	int err;
+ 	struct fuse_loop_config *config = fuse_loop_cfg_create();
+ 	if (clone_fd > 0)
+ 		 fuse_loop_cfg_set_clone_fd(config, clone_fd);
+-	return fuse_session_loop_mt_312(se, config);
++	err = fuse_session_loop_mt_312(se, config);
++
++	fuse_loop_cfg_destroy(config);
++
++	return err;
+ }
+ 
+ struct fuse_loop_config *fuse_loop_cfg_create(void)
+-- 
+2.27.0
+

_service:tar_scm:0004-add-nullptr-check-in-fuse_session_mount.patch Added

@@ -0,0 +1,49 @@
+From f88e08f34d2d4f398f23797707e1c50cd306e405 Mon Sep 17 00:00:00 2001
+From: Bernd Schubert <bschubert@ddn.com>
+Date: Tue, 25 Jun 2024 07:05:19 +0200
+Subject: PATCH Add nullptr check in fuse_session_mount
+
+The pointer did not have any sanity check.
+
+Addresses https://github.com/libfuse/libfuse/issues/979
+
+---
+ lib/fuse_lowlevel.c | 5 +++++
+ lib/mount_util.c    | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
+index fdef193..47c3065 100644
+--- a/lib/fuse_lowlevel.c
++++ b/lib/fuse_lowlevel.c
+@@ -3145,6 +3145,11 @@ int fuse_session_mount(struct fuse_session *se, const char *mountpoint)
+ {
+ 	int fd;
+ 
++	if (mountpoint == NULL) {
++		fuse_log(FUSE_LOG_ERR, "Invalid null-ptr mountpoint!\n");
++		return -1;
++	}
++
+ 	/*
+ 	 * Make sure file descriptors 0, 1 and 2 are open, otherwise chaos
+ 	 * would ensue.
+diff --git a/lib/mount_util.c b/lib/mount_util.c
+index 8027a2e..c90ba92 100644
+--- a/lib/mount_util.c
++++ b/lib/mount_util.c
+@@ -363,6 +363,11 @@ int fuse_mnt_parse_fuse_fd(const char *mountpoint)
+ 	int fd = -1;
+ 	int len = 0;
+ 
++	if (mountpoint == NULL) {
++		fprintf(stderr, "Invalid null-ptr mount-point!\n");
++		return -1;
++	}
++
+ 	if (sscanf(mountpoint, "/dev/fd/%u%n", &fd, &len) == 1 &&
+ 	    len == strlen(mountpoint)) {
+ 		return fd;
+-- 
+2.27.0
+

_service Changed

Changes of Revision 2