summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/CVE-2022-41973.patch154
-rw-r--r--meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb4
2 files changed, 158 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/multipath-tools/files/CVE-2022-41973.patch b/meta-oe/recipes-support/multipath-tools/files/CVE-2022-41973.patch
new file mode 100644
index 0000000000..d06ef44f68
--- /dev/null
+++ b/meta-oe/recipes-support/multipath-tools/files/CVE-2022-41973.patch
@@ -0,0 +1,154 @@
1From cb57b930fa690ab79b3904846634681685e3470f Mon Sep 17 00:00:00 2001
2From: Martin Wilck <mwilck@suse.com>
3Date: Thu, 1 Sep 2022 19:21:30 +0200
4Subject: [PATCH] multipath-tools: use /run instead of /dev/shm
5
6/dev/shm may have unsafe permissions. Use /run instead.
7Use systemd's tmpfiles.d mechanism to create /run/multipath
8early during boot.
9
10For backward compatibilty, make the runtime directory configurable
11via the "runtimedir" make variable.
12
13Signed-off-by: Martin Wilck <mwilck@suse.com>
14Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
15
16CVE: CVE-2022-41973
17Upstream-Status: Backport [https://github.com/opensvc/multipath-tools/commit/cb57b930fa690ab79b3904846634681685e3470f]
18Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
19---
20 .gitignore | 2 ++
21 Makefile.inc | 7 ++++++-
22 libmultipath/defaults.h | 3 +--
23 multipath/Makefile | 11 ++++++++---
24 multipath/{multipath.rules => multipath.rules.in} | 4 ++--
25 multipath/tmpfiles.conf.in | 1 +
26 6 files changed, 20 insertions(+), 8 deletions(-)
27 rename multipath/{multipath.rules => multipath.rules.in} (95%)
28 create mode 100644 multipath/tmpfiles.conf.in
29
30diff --git a/.gitignore b/.gitignore
31index 9926756b..f90b0350 100644
32--- a/.gitignore
33+++ b/.gitignore
34@@ -8,6 +8,8 @@
35 *.d
36 kpartx/kpartx
37 multipath/multipath
38+multipath/multipath.rules
39+multipath/tmpfiles.conf
40 multipathd/multipathd
41 mpathpersist/mpathpersist
42 .nfs*
43diff --git a/Makefile.inc b/Makefile.inc
44index 4eb08eed..648f91b4 100644
45--- a/Makefile.inc
46+++ b/Makefile.inc
47@@ -44,6 +44,7 @@ exec_prefix = $(prefix)
48 usr_prefix = $(prefix)
49 bindir = $(exec_prefix)/usr/sbin
50 libudevdir = $(prefix)/$(SYSTEMDPATH)/udev
51+tmpfilesdir = $(prefix)/$(SYSTEMDPATH)/tmpfiles.d
52 udevrulesdir = $(libudevdir)/rules.d
53 multipathdir = $(TOPDIR)/libmultipath
54 man8dir = $(prefix)/usr/share/man/man8
55@@ -60,6 +61,7 @@ libdmmpdir = $(TOPDIR)/libdmmp
56 nvmedir = $(TOPDIR)/libmultipath/nvme
57 includedir = $(prefix)/usr/include
58 pkgconfdir = $(usrlibdir)/pkgconfig
59+runtimedir := /$(RUN)
60
61 GZIP = gzip -9 -c
62 RM = rm -f
63@@ -95,7 +97,10 @@ OPTFLAGS += -Wextra -Wstrict-prototypes -Wformat=2 -Werror=implicit-int \
64 -Wno-unused-parameter -Werror=cast-qual \
65 -Werror=discarded-qualifiers
66
67-CPPFLAGS := -Wp,-D_FORTIFY_SOURCE=2
68+CPPFLAGS := $(FORTIFY_OPT) \
69+ -DBIN_DIR=\"$(bindir)\" -DMULTIPATH_DIR=\"$(plugindir)\" -DRUN_DIR=\"${RUN}\" \
70+ -DRUNTIME_DIR=\"$(runtimedir)\" \
71+ -DCONFIG_DIR=\"$(configdir)\" -DEXTRAVERSION=\"$(EXTRAVERSION)\" -MMD -MP
72 CFLAGS := $(OPTFLAGS) -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
73 -MMD -MP $(CFLAGS)
74 BIN_CFLAGS = -fPIE -DPIE
75diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h
76index c2164c16..908e0ca3 100644
77--- a/libmultipath/defaults.h
78+++ b/libmultipath/defaults.h
79@@ -64,8 +64,7 @@
80 #define DEFAULT_WWIDS_FILE "/etc/multipath/wwids"
81 #define DEFAULT_PRKEYS_FILE "/etc/multipath/prkeys"
82 #define DEFAULT_CONFIG_DIR "/etc/multipath/conf.d"
83-#define MULTIPATH_SHM_BASE "/dev/shm/multipath/"
84-
85+#define MULTIPATH_SHM_BASE RUNTIME_DIR "/multipath/"
86
87 static inline char *set_default(char *str)
88 {
89diff --git a/multipath/Makefile b/multipath/Makefile
90index e720c7f6..28976546 100644
91--- a/multipath/Makefile
92+++ b/multipath/Makefile
93@@ -12,7 +12,7 @@ EXEC = multipath
94
95 OBJS = main.o
96
97-all: $(EXEC)
98+all: $(EXEC) multipath.rules tmpfiles.conf
99
100 $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so
101 $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS)
102@@ -26,7 +26,9 @@ install:
103 $(INSTALL_PROGRAM) -m 755 mpathconf $(DESTDIR)$(bindir)/
104 $(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir)
105 $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir)
106- $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules
107+ $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)$(udevrulesdir)/56-multipath.rules
108+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(tmpfilesdir)
109+ $(INSTALL_PROGRAM) -m 644 tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/multipath.conf
110 $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
111 $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
112 $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
113@@ -43,9 +45,12 @@ uninstall:
114 $(RM) $(DESTDIR)$(man8dir)/mpathconf.8.gz
115
116 clean: dep_clean
117- $(RM) core *.o $(EXEC) *.gz
118+ $(RM) core *.o $(EXEC) multipath.rules tmpfiles.conf
119
120 include $(wildcard $(OBJS:.o=.d))
121
122 dep_clean:
123 $(RM) $(OBJS:.o=.d)
124+
125+%: %.in
126+ sed 's,@RUNTIME_DIR@,$(runtimedir),' $< >$@
127diff --git a/multipath/multipath.rules b/multipath/multipath.rules.in
128similarity index 95%
129rename from multipath/multipath.rules
130rename to multipath/multipath.rules.in
131index 0486bf70..5fb499e6 100644
132--- a/multipath/multipath.rules
133+++ b/multipath/multipath.rules.in
134@@ -1,8 +1,8 @@
135 # Set DM_MULTIPATH_DEVICE_PATH if the device should be handled by multipath
136 SUBSYSTEM!="block", GOTO="end_mpath"
137 KERNEL!="sd*|dasd*|nvme*", GOTO="end_mpath"
138-ACTION=="remove", TEST=="/dev/shm/multipath/find_multipaths/$major:$minor", \
139- RUN+="/usr/bin/rm -f /dev/shm/multipath/find_multipaths/$major:$minor"
140+ACTION=="remove", TEST=="@RUNTIME_DIR@/multipath/find_multipaths/$major:$minor", \
141+ RUN+="/usr/bin/rm -f @RUNTIME_DIR@/multipath/find_multipaths/$major:$minor"
142 ACTION!="add|change", GOTO="end_mpath"
143
144 IMPORT{cmdline}="nompath"
145diff --git a/multipath/tmpfiles.conf.in b/multipath/tmpfiles.conf.in
146new file mode 100644
147index 00000000..21be438a
148--- /dev/null
149+++ b/multipath/tmpfiles.conf.in
150@@ -0,0 +1 @@
151+d @RUNTIME_DIR@/multipath 0700 root root -
152--
1532.25.1
154
diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb
index 90cfd7d202..23273f5d5b 100644
--- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb
+++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb
@@ -45,6 +45,7 @@ SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=http;branch=mas
45 file://0031-Always-use-devmapper-for-kpartx.patch \ 45 file://0031-Always-use-devmapper-for-kpartx.patch \
46 file://0001-fix-bug-of-do_compile-and-do_install.patch \ 46 file://0001-fix-bug-of-do_compile-and-do_install.patch \
47 file://0001-add-explicit-dependency-on-libraries.patch \ 47 file://0001-add-explicit-dependency-on-libraries.patch \
48 file://CVE-2022-41973.patch \
48 " 49 "
49 50
50LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" 51LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
@@ -117,3 +118,6 @@ FILES_kpartx = "${base_sbindir}/kpartx \
117 118
118RDEPENDS_${PN} += "kpartx" 119RDEPENDS_${PN} += "kpartx"
119PARALLEL_MAKE = "" 120PARALLEL_MAKE = ""
121
122FILES:${PN}-libs += "usr/lib/*.so.*"
123FILES:${PN}-libs += "usr/lib/tmpfiles.d/*"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-18 05:01:12 +0000