diff --git a/fix-compile-error-because-of-ns-colliding.patch b/0000-fix-compile-error-because-of-ns-colliding.patch similarity index 100% rename from fix-compile-error-because-of-ns-colliding.patch rename to 0000-fix-compile-error-because-of-ns-colliding.patch diff --git a/fix-chown-and-mknod-failed.patch b/0001-fix-chown-and-mknod-failed.patch similarity index 100% rename from fix-chown-and-mknod-failed.patch rename to 0001-fix-chown-and-mknod-failed.patch diff --git a/0002-libfuse-Assign-NULL-to-old-to-avoid-free-it-twice-52.patch b/0002-libfuse-Assign-NULL-to-old-to-avoid-free-it-twice-52.patch new file mode 100644 index 0000000000000000000000000000000000000000..bd6a0e5f233a9e0db588025e20ede99619fe608f --- /dev/null +++ b/0002-libfuse-Assign-NULL-to-old-to-avoid-free-it-twice-52.patch @@ -0,0 +1,29 @@ +From d632df7ef5ede4d5a818a1bedbea8659113470b8 Mon Sep 17 00:00:00 2001 +From: winndows +Date: Wed, 1 Jul 2020 13:20:01 +0800 +Subject: [PATCH 1/2] libfuse: Assign NULL to "old" to avoid free it twice + (#522) + +Assign NULL to "old" at the first free(), to avoid the possible 2nd free() for it. + +Signed-off-by: Liao Pingfang +Co-authored-by: Liao Pingfang +--- + lib/modules/iconv.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/modules/iconv.c b/lib/modules/iconv.c +index eb5edd8..3a4db7c 100644 +--- a/lib/modules/iconv.c ++++ b/lib/modules/iconv.c +@@ -705,6 +705,7 @@ static struct fuse_fs *iconv_new(struct fuse_args *args, + if (old) { + setlocale(LC_CTYPE, old); + free(old); ++ old = NULL; + } + + ic->next = next[0]; +-- +1.8.3.1 + diff --git a/0003-fuse_lowlevel-Move-assert-for-se-before-dereferencin.patch b/0003-fuse_lowlevel-Move-assert-for-se-before-dereferencin.patch new file mode 100644 index 0000000000000000000000000000000000000000..5040a337de3e1ca5b7273adf3a456320ea94bdaf --- /dev/null +++ b/0003-fuse_lowlevel-Move-assert-for-se-before-dereferencin.patch @@ -0,0 +1,39 @@ +From bcb7659504c0b0ba6ab0fe0db930b686381da9ab Mon Sep 17 00:00:00 2001 +From: winndows +Date: Sat, 11 Jul 2020 02:58:07 +0800 +Subject: [PATCH 2/2] fuse_lowlevel: Move assert for se before dereferencing it + with se->debug (#530) + +Move assert for se before dereferencing it with se->debug. + +Signed-off-by: Liao Pingfang + +Co-authored-by: Liao Pingfang +--- + lib/fuse_lowlevel.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c +index 3dabbd5..7b72ee0 100644 +--- a/lib/fuse_lowlevel.c ++++ b/lib/fuse_lowlevel.c +@@ -167,6 +167,7 @@ static int fuse_send_msg(struct fuse_session *se, struct fuse_chan *ch, + { + struct fuse_out_header *out = iov[0].iov_base; + ++ assert(se != NULL); + out->len = iov_length(iov, count); + if (se->debug) { + if (out->unique == 0) { +@@ -189,8 +190,6 @@ static int fuse_send_msg(struct fuse_session *se, struct fuse_chan *ch, + int err = errno; + + if (res == -1) { +- assert(se != NULL); +- + /* ENOENT means the operation was interrupted */ + if (!fuse_session_exited(se) && err != ENOENT) + perror("fuse: writing device"); +-- +1.8.3.1 + diff --git a/fuse-3.9.0.tar.xz b/fuse-3.9.0.tar.xz deleted file mode 100644 index 4bf526bac2c099156fcfcb80d498fa5f6fd19ec1..0000000000000000000000000000000000000000 Binary files a/fuse-3.9.0.tar.xz and /dev/null differ diff --git a/fuse-3.9.2.tar.xz b/fuse-3.9.2.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..43102b376baab76f6b4822a1ee0a75d90ebc4516 Binary files /dev/null and b/fuse-3.9.2.tar.xz differ diff --git a/fuse.spec b/fuse.spec index f062df0ecb42e600689c7c0c1a6a053215fc80fe..0e5cc57f1411a1cf4e9c94a4e2290f81c395aa2c 100644 --- a/fuse.spec +++ b/fuse.spec @@ -1,9 +1,9 @@ %global fuse2ver 2.9.9 -%global fuse3ver 3.9.0 +%global fuse3ver 3.9.2 Name: fuse Version: %{fuse2ver} -Release: 0 +Release: 2 Summary: User space File System of fuse2 License: GPL+ and LGPLv2+ URL: http://fuse.sf.net @@ -13,8 +13,10 @@ Source0: https://github.com/libfuse/libfuse/archive/%{name}-%{fuse2ver}.tar.gz Source1: https://github.com/libfuse/libfuse/archive/%{name}-%{fuse3ver}.tar.xz Source2: %{name}.conf -Patch1: fix-compile-error-because-of-ns-colliding.patch -Patch2: fix-chown-and-mknod-failed.patch +Patch0: 0000-fix-compile-error-because-of-ns-colliding.patch +Patch1: 0001-fix-chown-and-mknod-failed.patch +Patch2: 0002-libfuse-Assign-NULL-to-old-to-avoid-free-it-twice-52.patch +Patch3: 0003-fuse_lowlevel-Move-assert-for-se-before-dereferencin.patch BuildRequires: libselinux-devel, pkgconfig, systemd-udev, meson, fdupes BuildRequires: autoconf, automake, libtool, gettext-devel, ninja-build @@ -82,12 +84,16 @@ This contains man files for the using of fuse # fuse 2 pushd %{name}-%{fuse2ver} -%patch1 -p1 +%patch0 -p1 +%patch2 -p1 popd # fuse 3 pushd %{name}-%{fuse3ver} +%patch1 -p1 %patch2 -p1 +%patch3 -p1 + popd %build @@ -172,6 +178,21 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir} %changelog +* Mon Jul 13 2020 Zhiqiang Liu -3.9.2-2 +- backport upstream bugfix patches + +* Mon Jul 06 2020 Youming Zhang -3.9.2-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:update fuse3 from 3.9.0 to 3.9.2 + +* Tue Jun 30 2020 Zhiqiang Liu - 2.9.9-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:renumber patches + * Sat Jan 11 2020 openEuler Buildteam - 2.9.9-0 - Type:enhancement - ID:NA