From 72c45ff37dff419991f2edac1117b616c2ab9201a771ef9849b7fc0c5f58793d Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Mon, 24 Oct 2022 08:46:58 +0000 Subject: [PATCH 1/3] Accepting request 1030690 from home:mwilck:multipath - Update to version 0.9.2+57+suse.cf3c1e9: * Fix multipathd authorization bypass and symlink attack (bsc#1202739 CVE-2022-41973 CVE-2022-41974) * Use "queue_mode bio" for NVMeoF/TCP devices * Upstream bug fixes and hwtable updates OBS-URL: https://build.opensuse.org/request/show/1030690 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=295 --- _servicedata | 2 +- multipath-dracut.conf | 2 ++ multipath-tools-0.9.1+52+suse.be8809e.obscpio | 3 --- multipath-tools-0.9.2+57+suse.cf3c1e9.obscpio | 3 +++ multipath-tools.changes | 10 ++++++---- multipath-tools.obsinfo | 6 +++--- multipath-tools.spec | 10 ++++++++-- 7 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 multipath-dracut.conf delete mode 100644 multipath-tools-0.9.1+52+suse.be8809e.obscpio create mode 100644 multipath-tools-0.9.2+57+suse.cf3c1e9.obscpio diff --git a/_servicedata b/_servicedata index c3b4a80..3861354 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/multipath-tools.git - 9c6c43556abfa2cc4133cee88709cec33b1f7b83 \ No newline at end of file + cf3c1e964c0cf482cce2a32b8835be688f46841c \ No newline at end of file diff --git a/multipath-dracut.conf b/multipath-dracut.conf new file mode 100644 index 0000000..df5d7ea --- /dev/null +++ b/multipath-dracut.conf @@ -0,0 +1,2 @@ +# Make sure the tmpfiles entry exists in initramfs already +install_items+=" @TMPFILESDIR@/multipath.conf " diff --git a/multipath-tools-0.9.1+52+suse.be8809e.obscpio b/multipath-tools-0.9.1+52+suse.be8809e.obscpio deleted file mode 100644 index 692cd81..0000000 --- a/multipath-tools-0.9.1+52+suse.be8809e.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ba0163b895560da7260bcd9963eac14f8141785e2077b6011803bae0581709df -size 2731020 diff --git a/multipath-tools-0.9.2+57+suse.cf3c1e9.obscpio b/multipath-tools-0.9.2+57+suse.cf3c1e9.obscpio new file mode 100644 index 0000000..cd3966f --- /dev/null +++ b/multipath-tools-0.9.2+57+suse.cf3c1e9.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58b8d35647452a96a25c8420a1513cef7042e872f7685d07c6ab23f67cc7bb21 +size 2762252 diff --git a/multipath-tools.changes b/multipath-tools.changes index 470b2b9..4957084 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,9 +1,11 @@ ------------------------------------------------------------------- -Fri Sep 9 19:38:03 UTC 2022 - Martin Wilck +Mon Oct 24 08:22:20 UTC 2022 - mwilck@suse.com -- Update to version 0.9.1+52+suse.be8809e: - * Code-identical to 0.9.1+48+suse.9c6c435 (merge in git repo - to preserve history; fix revision in _service file). +- Update to version 0.9.2+57+suse.cf3c1e9: + * Fix multipathd authorization bypass and symlink attack + (bsc#1202739 CVE-2022-41973 CVE-2022-41974) + * Use "queue_mode bio" for NVMeoF/TCP devices + * Upstream bug fixes and hwtable updates ------------------------------------------------------------------- Wed Sep 7 13:52:36 UTC 2022 - Martin Wilck diff --git a/multipath-tools.obsinfo b/multipath-tools.obsinfo index cc2937b..7ed4049 100644 --- a/multipath-tools.obsinfo +++ b/multipath-tools.obsinfo @@ -1,4 +1,4 @@ name: multipath-tools -version: 0.9.1+52+suse.be8809e -mtime: 1662752041 -commit: be8809e0370fab9f72ca0e3c3b642ef7ebc4ced5 +version: 0.9.2+57+suse.cf3c1e9 +mtime: 1666599331 +commit: cf3c1e964c0cf482cce2a32b8835be688f46841c diff --git a/multipath-tools.spec b/multipath-tools.spec index f1eb5a8..fb6617b 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -34,7 +34,7 @@ %define libdmmp_version %(echo %{_libdmmp_version} | tr . _) Name: multipath-tools -Version: 0.9.1+52+suse.be8809e +Version: 0.9.2+57+suse.cf3c1e9 Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0-only AND GPL-3.0-or-later @@ -48,6 +48,7 @@ Source2: dont-del-part-nodes.rules Source3: dm-parts.conf Source4: libmpathpersist-example.c Source5: libmpathpersist-example-old.c +Source6: multipath-dracut.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} BuildRequires: libaio-devel @@ -188,6 +189,8 @@ mkdir -p %{buildroot}/usr/lib/modules-load.d install -m 644 -D %{SOURCE1} "%{buildroot}/usr/lib/modules-load.d/multipath.conf" install -m 644 %{SOURCE2} %{buildroot}%{_udevrulesdir}/00-dont-del-part-nodes.rules install -m 644 -D %{SOURCE3} %{buildroot}/usr/lib/dracut/dracut.conf.d/dm-parts.conf +install -m 644 -D %{SOURCE6} %{buildroot}/usr/lib/dracut/dracut.conf.d/multipath.conf +sed -i 's,@TMPFILESDIR@,%{_tmpfilesdir},' %{buildroot}/usr/lib/dracut/dracut.conf.d/multipath.conf %post -n libmpath0 -p %{run_ldconfig} %postun -n libmpath0 -p %{run_ldconfig} @@ -198,6 +201,7 @@ install -m 644 -D %{SOURCE3} %{buildroot}/usr/lib/dracut/dracut.conf.d/dm-parts. %post [ -f /.buildenv ] && exit 0 +%tmpfiles_create %{_tmpfilesdir}/multipath.conf %service_add_post multipathd.socket multipathd.service if [ $1 -eq 1 ]; then [ ! -x /sbin/modprobe ] || /sbin/modprobe dm_multipath || true @@ -233,12 +237,14 @@ exit 0 /usr/lib/modules-load.d/multipath.conf %dir /usr/lib/dracut %dir /usr/lib/dracut/dracut.conf.d - +/usr/lib/dracut/dracut.conf.d/multipath.conf +%{_tmpfilesdir}/multipath.conf %{_mandir}/man8/multipath.8* %{_mandir}/man5/multipath.conf.5* %{_mandir}/man8/multipathd.8* %{_mandir}/man8/multipathc.8* %{_mandir}/man8/mpathpersist.8* +%ghost /run/multipath %files -n libmpath0 %{libdir}/libmultipath.so.0 From 2e7f2f1fb6a496178d24f1e2687e799c45692d05cd8b90737ecb7ed9c8fe4a94 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Mon, 24 Oct 2022 09:10:55 +0000 Subject: [PATCH 2/3] Accepting request 1030700 from home:mwilck:multipath * add multipath-dracut.conf: dracut config file to install tmpfiles.d/multipath.conf in initramfs - Drop recompress.service, it just slows down build OBS-URL: https://build.opensuse.org/request/show/1030700 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=296 --- _service | 4 ---- multipath-tools-0.9.2+57+suse.cf3c1e9.obscpio | 2 +- multipath-tools.changes | 3 +++ multipath-tools.spec | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/_service b/_service index d965534..d912a05 100644 --- a/_service +++ b/_service @@ -11,8 +11,4 @@ - - *.tar - xz - diff --git a/multipath-tools-0.9.2+57+suse.cf3c1e9.obscpio b/multipath-tools-0.9.2+57+suse.cf3c1e9.obscpio index cd3966f..5f85b04 100644 --- a/multipath-tools-0.9.2+57+suse.cf3c1e9.obscpio +++ b/multipath-tools-0.9.2+57+suse.cf3c1e9.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58b8d35647452a96a25c8420a1513cef7042e872f7685d07c6ab23f67cc7bb21 +oid sha256:2a9e4f3306abafb564caf1e1767c210e6d5f3e61f7c90bf5f359826cf552cf89 size 2762252 diff --git a/multipath-tools.changes b/multipath-tools.changes index 4957084..5018d35 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -4,8 +4,11 @@ Mon Oct 24 08:22:20 UTC 2022 - mwilck@suse.com - Update to version 0.9.2+57+suse.cf3c1e9: * Fix multipathd authorization bypass and symlink attack (bsc#1202739 CVE-2022-41973 CVE-2022-41974) + * add multipath-dracut.conf: dracut config file to install + tmpfiles.d/multipath.conf in initramfs * Use "queue_mode bio" for NVMeoF/TCP devices * Upstream bug fixes and hwtable updates +- Drop recompress.service, it just slows down build ------------------------------------------------------------------- Wed Sep 7 13:52:36 UTC 2022 - Martin Wilck diff --git a/multipath-tools.spec b/multipath-tools.spec index fb6617b..f009861 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -40,7 +40,7 @@ Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0-only AND GPL-3.0-or-later Group: System/Base URL: http://christophe.varoqui.free.fr/ -Source: multipath-tools-%{version}.tar.xz +Source: multipath-tools-%{version}.tar Source1: multipath.conf # SUSE policy: disable partition deletion by default Source2: dont-del-part-nodes.rules From c15c52cb59352ac6e39f3adce399492bcebabd4093fa72084a1e19a2df9df894 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Mon, 24 Oct 2022 10:33:09 +0000 Subject: [PATCH 3/3] Accepting request 1030842 from home:mwilck:multipath - Update to version 0.9.1+52+suse.be8809e: * Code-identical to 0.9.1+48+suse.9c6c435 (merge in git repo to preserve history; fix revision in _service file). OBS-URL: https://build.opensuse.org/request/show/1030842 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=297 --- multipath-tools-0.9.2+57+suse.cf3c1e9.obscpio | 2 +- multipath-tools.changes | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/multipath-tools-0.9.2+57+suse.cf3c1e9.obscpio b/multipath-tools-0.9.2+57+suse.cf3c1e9.obscpio index 5f85b04..7207e34 100644 --- a/multipath-tools-0.9.2+57+suse.cf3c1e9.obscpio +++ b/multipath-tools-0.9.2+57+suse.cf3c1e9.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a9e4f3306abafb564caf1e1767c210e6d5f3e61f7c90bf5f359826cf552cf89 +oid sha256:10feefaa2421c540e8211aefa0baff64d3e2c736ab66e0a1e34f225d9b37e5e9 size 2762252 diff --git a/multipath-tools.changes b/multipath-tools.changes index 5018d35..e5ae0a1 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Mon Oct 24 08:22:20 UTC 2022 - mwilck@suse.com +Mon Oct 24 08:22:20 UTC 2022 - Martin Wilck - Update to version 0.9.2+57+suse.cf3c1e9: * Fix multipathd authorization bypass and symlink attack @@ -10,6 +10,13 @@ Mon Oct 24 08:22:20 UTC 2022 - mwilck@suse.com * Upstream bug fixes and hwtable updates - Drop recompress.service, it just slows down build +------------------------------------------------------------------- +Fri Sep 9 19:38:03 UTC 2022 - Martin Wilck + +- Update to version 0.9.1+52+suse.be8809e: + * Code-identical to 0.9.1+48+suse.9c6c435 (merge in git repo + to preserve history; fix revision in _service file). + ------------------------------------------------------------------- Wed Sep 7 13:52:36 UTC 2022 - Martin Wilck