summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6c082e9)
raw | patch | inline | side by side (parent: 6c082e9)
author | Pavel Rochnyack <pavel2000@ngs.ru> | |
Wed, 31 May 2017 16:27:13 +0000 (23:27 +0700) | ||
committer | Florian Forster <octo@collectd.org> | |
Wed, 27 Sep 2017 06:15:35 +0000 (08:15 +0200) |
snmp_sess_synch_response() always frees request PDU, in both case of request
error and success. If error condition occurs inside of `while (status == 0)`
loop, double free of `req` happens.
Issue: #2291
Signed-off-by: Florian Forster <octo@collectd.org>
error and success. If error condition occurs inside of `while (status == 0)`
loop, double free of `req` happens.
Issue: #2291
Signed-off-by: Florian Forster <octo@collectd.org>
src/snmp.c | patch | blob | history |
diff --git a/src/snmp.c b/src/snmp.c
index 287f44b4e9ba5f5fbeb0b3b61f97f4f65475f17f..6e26ad59da4b2b05da4e8813754392fa66d3c43e 100644 (file)
--- a/src/snmp.c
+++ b/src/snmp.c
@@ -1357,11 +1357,13 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
if (oid_list_todo_num == 0) {
/* The request is still empty - so we are finished */
DEBUG("snmp plugin: all variables have left their subtree");
+ snmp_free_pdu(req);
status = 0;
break;
}
res = NULL;
+ /* snmp_sess_synch_response always frees our req PDU */
status = snmp_sess_synch_response(host->sess_handle, req, &res);
if ((status != STAT_SUCCESS) || (res == NULL)) {
char *errstr = NULL;
@@ -1376,8 +1378,6 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
snmp_free_pdu(res);
res = NULL;
- /* snmp_synch_response already freed our PDU */
- req = NULL;
sfree(errstr);
csnmp_host_close_session(host);
@@ -1492,9 +1492,6 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) {
snmp_free_pdu(res);
res = NULL;
- if (req != NULL)
- snmp_free_pdu(req);
- req = NULL;
if (status == 0)
csnmp_dispatch_table(host, data, instance_list_head, value_list_head);