upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-04-15 22:00:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

check_snmp: Don't thrash memory when using multiple label/unit argument

Browse source 
The memory allocation mixed up number of bytes with number of pointers,
meaning as soon as we'd reach (on 64 bit systems) the second argument,
we'd start writing it outside of our allocated memory.

Normally, this isn't too visible, but as soon as you (again, on my 64
bit system) reach argument number 8, you get a segfault. It is easily
reproducible with:
check_snmp -o '' -l '' -o '' -l '' -o '' -l '' -o '' -l '' \
           -o '' -l '' -o '' -l '' -o '' -l '' -o '' -l ''

This patch allocates the proper amount of memory, to fix the issue.

Signed-off-by: Robin Sonefors <robin.sonefors@op5.com>
This commit is contained in:
Robin Sonefors 2013-01-23 19:10:55 +01:00 committed by Sven Nierlein
parent 1845c4cdf9
commit 77eba26361
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
plugins/check_snmp.c
View file

@ -200,8 +200,8 @@ main (int argc, char **argv)
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
labels = malloc (labels_size);
unitv = malloc (unitv_size);
labels = malloc (labels_size * sizeof(*labels));
unitv = malloc (unitv_size * sizeof(*unitv));
for (i = 0; i < MAX_OIDS; i++)
eval_method[i] = CHECK_UNDEF;
@ -768,9 +768,9 @@ process_arguments (int argc, char **argv)
break;
case 'l': /* label */
nlabels++;
if (nlabels >= labels_size) {
if (nlabels > labels_size) {
labels_size += 8;
labels = realloc (labels, labels_size);
labels = realloc (labels, labels_size * sizeof(*labels));
if (labels == NULL)
die (STATE_UNKNOWN, _("Could not reallocate labels[%d]"), (int)nlabels);
}
@ -780,13 +780,13 @@ process_arguments (int argc, char **argv)
if (ptr[0] == '\'')
labels[nlabels - 1] = ptr + 1;
while (ptr && (ptr = nextarg (ptr))) {
if (nlabels >= labels_size) {
nlabels++;
if (nlabels > labels_size) {
labels_size += 8;
labels = realloc (labels, labels_size);
labels = realloc (labels, labels_size * sizeof(*labels));
if (labels == NULL)
die (STATE_UNKNOWN, _("Could not reallocate labels\n"));
}
nlabels++;
ptr = thisarg (ptr);
if (ptr[0] == '\'')
labels[nlabels - 1] = ptr + 1;
@ -797,9 +797,9 @@ process_arguments (int argc, char **argv)
case 'u': /* units */
units = optarg;
nunits++;
if (nunits >= unitv_size) {
if (nunits > unitv_size) {
unitv_size += 8;
unitv = realloc (unitv, unitv_size);
unitv = realloc (unitv, unitv_size * sizeof(*unitv));
if (unitv == NULL)
die (STATE_UNKNOWN, _("Could not reallocate units [%d]\n"), (int)nunits);
}
@ -809,9 +809,9 @@ process_arguments (int argc, char **argv)
if (ptr[0] == '\'')
unitv[nunits - 1] = ptr + 1;
while (ptr && (ptr = nextarg (ptr))) {
if (nunits >= unitv_size) {
if (nunits > unitv_size) {
unitv_size += 8;
unitv = realloc (unitv, unitv_size);
unitv = realloc (unitv, unitv_size * sizeof(*unitv));
if (units == NULL)
die (STATE_UNKNOWN, _("Could not realloc() units\n"));
}