[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'
Florian Forster
octo at verplant.org
Sat Mar 31 15:52:18 CEST 2018
src/daemon/common.h | 3 ++
src/disk.c | 20 ++++++------
src/libcollectdclient/collectd/network_buffer.h | 2 ++
src/ovs_events.c | 6 ++--
src/ovs_stats.c | 37 ++++++++++++++++++-----
src/utils_ovs.c | 30 +++++++++++++-----
6 files changed, 69 insertions(+), 29 deletions(-)
New commits:
commit 3f24dce20ad6ea1b2ed11780f9423e8675885539
Author: Dagobert Michelsen <dam at opencsw.org>
Date: Thu Mar 22 14:54:01 2018 +0100
Include config.h early or _FILE_OFFSET_BITS is wrongly defined and bails out on Solaris 32 bit
commit 182556dd5a43942797591f0f49ac6f488c07010d
Merge: d929cb6 45df07a
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sat Mar 31 12:18:39 2018 +0200
Merge pull request #2716 from dago/kstat
Include kstat.h when available
commit d929cb64e9f243a080402769bf5e4626c9b5e9d3
Merge: cfdac90 ed696c1
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sat Mar 31 12:16:28 2018 +0200
Merge pull request #2688 from dstathis/master
change HAVE_UDEV_H to HAVE_LIBUDEV_H for bug 2651
commit cfdac9062577bc7b32b44e4090adf80d93171749
Merge: a9e50e9 c836c36
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sat Mar 31 11:17:08 2018 +0200
Merge pull request #2731 from elfiesmelfie/ovs_fixes
Ovs Fixes
commit c836c3660921a52ebff47dccd81f21cf9962c30a
Author: Kavanagh, Mark B <mark.b.kavanagh at intel.com>
Date: Tue Feb 27 17:28:55 2018 +0000
utils_ovs: fix resource leaks
In ovs_db_init(), upon failure of either ovs_db_event_thread_init()
and/or ovs_db_poll_thread_init(), ovs_db_destroy() is invoked, in
order to release OVSDB data resources.
However, in the event that ovs_db_destroy() returns an error value,
some OVSDB resources are never released, and are consequently lost.
Resolve this issue by checking the return value of ovs_db_destroy()
and manually releasing the appropriate resources accordingly.
Fixes: 5a90d0e ("ovs_events: Address PR comments")
Signed-off-by: Kavanagh, Mark B <mark.b.kavanagh at intel.com>
commit 7858bf59eeed7b8769dd7258af7ea223e37287e4
Author: Kavanagh, Mark B <mark.b.kavanagh at intel.com>
Date: Mon Feb 26 17:08:31 2018 +0000
utils_ovs: fix potential NULL
In ovs_utils_get_map_value(), YAJL_GET_ARRAY may return a NULL
pointer, which is subsequently dereferenced. Ensure that the
pointer is non-NULL before proceeding.
Fixes: 12f6497 ("ovs_events: Add external ids as metadata")
Signed-off-by: Mark Kavanagh <mark.b.kavanagh at intel.com>
commit d3617d45b787a4856359740717bb6936c98a241a
Author: Kavanagh, Mark B <mark.b.kavanagh at intel.com>
Date: Mon Feb 26 16:12:26 2018 +0000
utils_ovs: fix potential NULL-string dereference
In ovs_utils_get_map_value(), a potential NULL-string, returned
by YAJL_GET_STRING(), is passed to strcmp, and subsequently
dereferenced. Ensure that said string is non-NULL.
Fixes: cb59d85 ("ovs_events: Fix plugin collectd config file")
Signed-off-by: Mark Kavanagh <mark.b.kavanagh at intel.com>
commit 286f164a217885337e00b86f86b0a77d0c4845cc
Author: Kavanagh, Mark B <mark.b.kavanagh at intel.com>
Date: Mon Feb 26 14:49:00 2018 +0000
ovs_stats: fix potential NULL array dereference
In ovs_stats_update_bridge(), YAJL_GET_ARRAY() may return a NULL
pointer. Ensure that a non-NULL pointer is returned, before
attempting to dererence same.
Fixes: 4256753 ("ovs_events: fix scan-build warnings #2205")
Signed-off-by: Mark Kavanagh <mark.b.kavanagh at intel.com>
commit d70f64f4c908c0016fa26c976a74511b4ac4478d
Author: Mark Kavanagh <mark.b.kavanagh at intel.com>
Date: Mon Feb 19 16:39:31 2018 +0000
utils_ovs: fix potential NULL dereference
In ovs_utils_get_map_value(), YAJL_GET_ARRAY may return NULL,
which is subsequently dereferenced.
Ensure that the returned pointer is non-NULL before attempting
to dereference it.
Fixes: 12f6497 ("ovs_events: Add external ids as metadata")
Signed-off-by: Mark Kavanagh <mark.b.kavanagh at intel.com>
commit 2709cad046fabc6b6d3ff198dd39d188040f991c
Author: Mark Kavanagh <mark.b.kavanagh at intel.com>
Date: Thu Feb 22 11:55:44 2018 +0000
ovs_stats: fix memory leak
In ovs_stats_plugin_config(), memory may be allocated from the heap,
but is not subsequently freed in the case of failure later in the
function.
Fixes: bcf9c48 ("ovs_stats plugin: Fix a memory leak.")
Signed-off-by: Mark Kavanagh <mark.b.kavanagh at intel.com>
commit 39d06e521542649ceda75de781d5f83579df255f
Author: Mark Kavanagh <mark.b.kavanagh at intel.com>
Date: Wed Feb 21 16:15:01 2018 +0000
ovs_stats: fix potential NULL-string dereference
The YAJL_GET_STRING macro may return NULL; ensure that the returned
string is non-NULL, before passing it to ovs_stats_new_port(), within
the context of the ovs_stats_update_bridge() function.
Since this change introduces another return path, a single 'failure'
return point is introduced to ovs_stats_bridge().
Signed-off-by: Mark Kavanagh <mark.b.kavanagh at intel.com>
commit 4b0f10343baca980c684c7d2978b7bea684505b0
Author: Mark Kavanagh <mark.b.kavanagh at intel.com>
Date: Mon Feb 19 15:55:45 2018 +0000
utils_ovs: fix potential strcmp() NULL ptr param
YAJL_GET_STRING(array_values[0]) may return NULL if
array_values[0]->string is NULL; passing a NULL parameter to
strcmp() is not recommended, since the resultant behaviour may
be undefined.
Resolve the issue by adding a NULL check for the string returned
by YAJL_GET_STRING.
Fixes: cbq59d853 ("ovs_events: Fix plugin collectd config file")
Signed-off-by: Mark Kavanagh <mark.b.kavanagh at intel.com>
commit 968db56ae1744959d83974e78fda321ba5330232
Author: Mark Kavanagh <mark.b.kavanagh at intel.com>
Date: Mon Feb 19 15:23:46 2018 +0000
ovs_stats: fix potential NULL dereference
ovs_stats_update_iface() passes a pointer to a potentially-NULL
string to sstrncpy(); this is obviously problematic.
Add a check to ensure that the relevant string is non-NULL.
Fixes: 1cc7599 ("ovs_stats plugin: Fix null dereference of "port".)
Signed-off-by: Mark Kavanagh <mark.b.kavanagh at intel.com>
commit 86f2ca0370eaec2cbd6a5af36534e8bf12954a81
Author: Mark Kavanagh <mark.b.kavanagh at intel.com>
Date: Mon Feb 19 13:48:12 2018 +0000
ovs_stats: fix potential NULL dereference
ovs_stats_new_port() accepts a character pointer, uuid, as a parameter,
and copies it into port->uuid. Later, this value is dereferenced in
ovs_stats_update_bridge(). If uuid was NULL, then a SEGV will occur.
Resolve this issue by checking if uuid is NULL in ovs_stats_new_port().
Fixes: 481984e ("ovs_stats: Implement OVS statistics plugin.")
Signed-off-by: Mark Kavanagh <mark.b.kavanagh at intel.com>
commit 2b719323d06bb58f23fa7c43135739d0ab0cca12
Author: Mark Kavanagh <mark.b.kavanagh at intel.com>
Date: Mon Feb 19 13:06:36 2018 +0000
ovs_events: fix potential NULL pointer dereference
A potentially-NULL pointer to ovs_events_iface_info_t is defererenced
by an invocation of sizeof(), within ovs_events_get_iface_info().
Move the offending line, such that it is executed after the
NULL-pointer check.
Fixes: f6adec45 ("ovs_events: Fix notification metadata garbage.")
Signed-off-by: Mark Kavanagh <mark.b.kavanagh at intel.com>
commit 45df07a30926475b2a33f63f79cda615928a7d96
Author: Dagobert Michelsen <dam at opencsw.org>
Date: Wed Mar 21 21:22:45 2018 +0100
Include kstat.h when available
commit ed696c1b3adcb42d55759efe6f8034337f0fd243
Author: Dylan Stephano-Shachter <dylan at wopr.nasuni.net>
Date: Thu Feb 15 16:37:33 2018 -0500
change HAVE_UDEV_H to HAVE_LIBUDEV_H for bug 2651
More information about the collectd-changes
mailing list