diff --git a/SOURCES/lvm2-2_02_169-fix-segfault-in-lvmetad-from-missing-null-in-daemon_reply_simple.patch b/SOURCES/lvm2-2_02_169-fix-segfault-in-lvmetad-from-missing-null-in-daemon_reply_simple.patch new file mode 100644 index 0000000..21b85a4 --- /dev/null +++ b/SOURCES/lvm2-2_02_169-fix-segfault-in-lvmetad-from-missing-null-in-daemon_reply_simple.patch @@ -0,0 +1,50 @@ + WHATS_NEW | 4 ++++ + daemons/lvmetad/lvmetad-core.c | 9 ++++++--- + 2 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/WHATS_NEW b/WHATS_NEW +index 519bbc9..8ae2df8 100644 +--- a/WHATS_NEW ++++ b/WHATS_NEW +@@ -1,3 +1,7 @@ ++Version 2.02.169 - ++===================================== ++ Fix segfault in lvmetad from missing NULL in daemon_reply_simple. ++ + Version 2.02.167 - + ====================================== + Prevent raid4 creation/conversion on non-supporting kernels +diff --git a/daemons/lvmetad/lvmetad-core.c b/daemons/lvmetad/lvmetad-core.c +index 36a5cec..c46c7ac 100644 +--- a/daemons/lvmetad/lvmetad-core.c ++++ b/daemons/lvmetad/lvmetad-core.c +@@ -2745,7 +2745,8 @@ static response handler(daemon_state s, client_handle h, request r) + "expected = %s", state->token, + "received = %s", token, + "update_pid = " FMTd64, (int64_t)state->update_pid, +- "reason = %s", "another command has populated the cache"); ++ "reason = %s", "another command has populated the cache", ++ NULL); + } + + DEBUGLOG(state, "token_update end len %d pid %d new token %s", +@@ -2778,7 +2779,8 @@ static response handler(daemon_state s, client_handle h, request r) + "expected = %s", state->token, + "received = %s", token, + "update_pid = " FMTd64, (int64_t)state->update_pid, +- "reason = %s", "another command has populated the cache"); ++ "reason = %s", "another command has populated the cache", ++ NULL); + } + + /* If a pid doing update was cancelled, ignore its update messages. */ +@@ -2793,7 +2795,8 @@ static response handler(daemon_state s, client_handle h, request r) + "expected = %s", state->token, + "received = %s", token, + "update_pid = " FMTd64, (int64_t)state->update_pid, +- "reason = %s", "another command has populated the lvmetad cache"); ++ "reason = %s", "another command has populated the lvmetad cache", ++ NULL); + } + + pthread_mutex_unlock(&state->token_lock); diff --git a/SPECS/lvm2.spec b/SPECS/lvm2.spec index 4b808ad..f3a216d 100644 --- a/SPECS/lvm2.spec +++ b/SPECS/lvm2.spec @@ -51,7 +51,7 @@ Summary: Userland logical volume management tools Name: lvm2 Epoch: 7 Version: 2.02.166 -Release: 1%{?dist}.2 +Release: 1%{?dist}.3 License: GPLv2 Group: System Environment/Base URL: http://sources.redhat.com/lvm2 @@ -66,6 +66,7 @@ Patch6: lvm2-2_02_167-disable-lvconvert-of-thin-pool-to-raid-while-active.patch Patch7: lvm2-2_02_167-fix-inability-of-lvconvert-repair-for-cache-raid-volumes.patch Patch8: lvm2-2_02_167-fix-raid4-coversion-from-striped.patch Patch9: lvm2-2_02_167-prevent-raid4-creation-and-conversion-on-non-supporting-kernels.patch +Patch10: lvm2-2_02_169-fix-segfault-in-lvmetad-from-missing-null-in-daemon_reply_simple.patch BuildRequires: libselinux-devel >= %{libselinux_version}, libsepol-devel BuildRequires: libblkid-devel >= %{util_linux_version} @@ -121,6 +122,7 @@ or more physical volumes and creating one or more logical volumes %patch7 -p1 -b .lvconvert_cache_raid %patch8 -p1 -b .raid4_from_striped %patch9 -p1 -b .raid4_vs_kernel +%patch10 -p1 -b .lvmetad_segfault %build %global _default_pid_dir /run @@ -823,6 +825,9 @@ the device-mapper event library. %{_libdir}/pkgconfig/devmapper-event.pc %changelog +* Thu Feb 09 2017 Peter Rajnoha - 7:2.02.166-1.el7_3.3 +- Fix segfault in lvmetad from missing NULL in daemon_reply_simple. + * Wed Nov 16 2016 Peter Rajnoha - 7:2.02.166-1.el7_3.2 - Prevent raid4 creation/conversion on non-supporting kernels - Add direct striped -> raid4 conversion