Hello community, here is the log from the commit of package sbd for openSUSE:Factory checked in at 2015-11-06 00:04:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sbd (Old) and /work/SRC/openSUSE:Factory/.sbd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sbd" Changes: -------- --- /work/SRC/openSUSE:Factory/sbd/sbd.changes 2014-08-25 11:05:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sbd.new/sbd.changes 2015-11-06 00:04:24.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Oct 15 14:34:21 UTC 2015 - [email protected] + +- pacemaker: Prevent potential segfault caused by use-of-NULL on checking node state (bsc#950415) + * bug-950415_sbd-pacemaker-segfault.patch + +------------------------------------------------------------------- +Fri Sep 5 08:17:05 UTC 2014 - [email protected] + +- Update to version 1.2.1.git.1409904429.39dee2a: + + Medium: adjust timeout for s390(x) to be compatible with vmwatchdog (bnc#895103) + +------------------------------------------------------------------- Old: ---- sbd-1.2.1.git.1408100832.f0a4a63.tar.xz New: ---- bug-950415_sbd-pacemaker-segfault.patch sbd-1.2.1.git.1409904429.39dee2a.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sbd.spec ++++++ --- /var/tmp/diff_new_pack.f8AQEP/_old 2015-11-06 00:04:25.000000000 +0100 +++ /var/tmp/diff_new_pack.f8AQEP/_new 2015-11-06 00:04:25.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sbd # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2013 Lars Marowsky-Bree # # All modifications and additions to the file contributed by third parties @@ -21,13 +21,14 @@ Summary: Storage-based death License: GPL-2.0+ Group: Productivity/Clustering/HA -Version: 1.2.1.git.1408100832.f0a4a63 +Version: 1.2.1.git.1409904429.39dee2a Release: 0 Url: https://github.com/l-mb/sbd Source: %{name}-%{version}.tar.xz Patch1: add-explicit-libs.patch Patch2: sbd-configure-libcoroipcc.patch Patch3: sbd-pacemaker.patch +Patch4: bug-950415_sbd-pacemaker-segfault.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -60,6 +61,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 ########################################################### %build ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.f8AQEP/_old 2015-11-06 00:04:25.000000000 +0100 +++ /var/tmp/diff_new_pack.f8AQEP/_new 2015-11-06 00:04:25.000000000 +0100 @@ -1,5 +1,5 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/l-mb/sbd.git</param> - <param name="changesrevision">f0a4a63ca5</param></service> + <param name="changesrevision">39dee2ac89</param></service> </servicedata> \ No newline at end of file ++++++ bug-950415_sbd-pacemaker-segfault.patch ++++++ diff --git a/src/sbd-pacemaker.c b/src/sbd-pacemaker.c index 1ca412c..dce2a03 100644 --- a/src/sbd-pacemaker.c +++ b/src/sbd-pacemaker.c @@ -313,12 +313,12 @@ compute_status(pe_working_set_t * data_set) node_t *node = pe_find_node(data_set->nodes, local_uname); - if (node->details->unclean) { + if (node && node->details && node->details->unclean) { LOGONCE(4, LOG_WARNING, "Node state: UNCLEAN"); - } else if (node->details->pending) { + } else if (node && node->details && node->details->pending) { LOGONCE(5, LOG_WARNING, "Node state: pending"); healthy = 2; - } else if (node->details->online) { + } else if (node && node->details && node->details->online) { LOGONCE(6, LOG_INFO, "Node state: online"); healthy = 1; } else { ++++++ sbd-1.2.1.git.1408100832.f0a4a63.tar.xz -> sbd-1.2.1.git.1409904429.39dee2a.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.2.1.git.1408100832.f0a4a63/src/sbd-common.c new/sbd-1.2.1.git.1409904429.39dee2a/src/sbd-common.c --- old/sbd-1.2.1.git.1408100832.f0a4a63/src/sbd-common.c 2014-08-15 16:16:48.000000000 +0200 +++ new/sbd-1.2.1.git.1409904429.39dee2a/src/sbd-common.c 2015-11-04 14:48:11.000000000 +0100 @@ -23,11 +23,16 @@ static char sbd_version = 0x02; /* Tunable defaults: */ +#if defined(__s390__) || defined(__s390x__) +unsigned long timeout_watchdog = 15; +int timeout_msgwait = 30; +#else unsigned long timeout_watchdog = 5; +int timeout_msgwait = 10; +#endif unsigned long timeout_watchdog_warn = 3; int timeout_allocate = 2; int timeout_loop = 1; -int timeout_msgwait = 10; int timeout_io = 3; int timeout_startup = 120;
