Hello community, here is the log from the commit of package multipath-tools for openSUSE:Factory checked in at 2014-09-03 18:21:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/multipath-tools (Old) and /work/SRC/openSUSE:Factory/.multipath-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "multipath-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/multipath-tools/multipath-tools.changes 2014-08-28 10:01:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.multipath-tools.new/multipath-tools.changes 2014-09-03 20:26:04.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 29 12:00:49 CEST 2014 - hare@suse.de + +- Fixup segfault during uev_path_add() (bnc#892214) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ multipath-tools-0.5.0-sles12.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.NgUjfO/_old 2014-09-03 20:26:05.000000000 +0200 +++ /var/tmp/diff_new_pack.NgUjfO/_new 2014-09-03 20:26:05.000000000 +0200 @@ -5754,7 +5754,7 @@ int cli_list_daemon (void * v, char ** reply, int * len, void * data); int cli_list_maps (void * v, char ** reply, int * len, void * data); diff --git a/multipathd/main.c b/multipathd/main.c -index af93f32..872ea66 100644 +index af93f32..8edb8a0 100644 --- a/multipathd/main.c +++ b/multipathd/main.c @@ -88,10 +88,11 @@ struct mpath_event_param @@ -5855,7 +5855,9 @@ ret = pathinfo(pp, conf->hwtable, DI_ALL | DI_BLACKLIST); - if (ret == 2) { -+ if (ret == PATHINFO_SKIPPED) { ++ if (!ret) ++ ret = ev_add_path(pp, vecs); ++ else if (ret == PATHINFO_SKIPPED) { + condlog(3, "%s: remove blacklisted path", + uev->kernel); i = find_slot(vecs->pathvec, (void *)pp); @@ -5885,8 +5887,6 @@ - return 1; } - pp->checkint = conf->checkint; -+ if (!ret) -+ ret = ev_add_path(pp, vecs); } + lock_cleanup_pop(vecs->lock); + if (pp) @@ -7098,10 +7098,15 @@ +fi diff --git a/rpm/multipath-tools.changes b/rpm/multipath-tools.changes new file mode 100644 -index 0000000..ffb3cbb +index 0000000..7cf5c94 --- /dev/null +++ b/rpm/multipath-tools.changes -@@ -0,0 +1,1284 @@ +@@ -0,0 +1,1289 @@ ++------------------------------------------------------------------- ++Fri Aug 29 12:00:49 CEST 2014 - hare@suse.de ++ ++- Fixup segfault during uev_path_add() (bnc#892214) ++ +------------------------------------------------------------------- +Thu Aug 21 12:16:53 CEST 2014 - hare@suse.de + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org