author | Jesse Butler <jesse.butler@oracle.com> |
Tue, 18 Oct 2016 05:50:50 -0700 | |
changeset 7121 | 02252aa4d56c |
parent 5867 | 445e2cf1c845 |
permissions | -rw-r--r-- |
5867
445e2cf1c845
PSARC/2014/169 Net-snmp upgrade to version 5.7.2.1
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents:
1776
diff
changeset
|
1 |
# snmpd dumps core when snmpd.conf contains an incorrect logmatch param |
445e2cf1c845
PSARC/2014/169 Net-snmp upgrade to version 5.7.2.1
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents:
1776
diff
changeset
|
2 |
# Developed in-house. Bug submitted upstream |
445e2cf1c845
PSARC/2014/169 Net-snmp upgrade to version 5.7.2.1
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents:
1776
diff
changeset
|
3 |
# https://sourceforge.net/p/net-snmp/bugs/2591/ |
445e2cf1c845
PSARC/2014/169 Net-snmp upgrade to version 5.7.2.1
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents:
1776
diff
changeset
|
4 |
--- net-snmp-5.7.2.1/agent/mibgroup/ucd-snmp/logmatch.c Wed Feb 19 16:36:42 2014 |
445e2cf1c845
PSARC/2014/169 Net-snmp upgrade to version 5.7.2.1
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents:
1776
diff
changeset
|
5 |
+++ net-snmp-5.7.2.1/agent/mibgroup/ucd-snmp/logmatch.c Thu Oct 30 02:17:27 2014 |
445e2cf1c845
PSARC/2014/169 Net-snmp upgrade to version 5.7.2.1
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents:
1776
diff
changeset
|
6 |
@@ -435,6 +435,17 @@ |
1776
614fab3c797e
17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
7 |
regcomp(&(logmatchTable[logmatchCount].regexBuffer), |
614fab3c797e
17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
8 |
logmatchTable[logmatchCount].regEx, |
614fab3c797e
17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
9 |
REG_EXTENDED | REG_NOSUB); |
614fab3c797e
17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
10 |
+ if (logmatchTable[logmatchCount].myRegexError) |
614fab3c797e
17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
11 |
+ { |
614fab3c797e
17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
12 |
+ char regexErrorString[100]; |
614fab3c797e
17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
13 |
+ regerror(logmatchTable[logmatchCount].myRegexError, |
614fab3c797e
17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
14 |
+ &(logmatchTable[logmatchCount].regexBuffer), |
614fab3c797e
17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
15 |
+ regexErrorString, 100); |
614fab3c797e
17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
16 |
+ regexErrorString[99] = '\0'; |
614fab3c797e
17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
17 |
+ snmp_log(LOG_ERR, "Could not process the logmatch regex - %s," \ |
614fab3c797e
17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
18 |
+ "\n since regcomp() failed with - %s\n", |
614fab3c797e
17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
19 |
+ logmatchTable[logmatchCount].regEx, regexErrorString); |
614fab3c797e
17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
20 |
+ } |
614fab3c797e
17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
21 |
|
614fab3c797e
17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
22 |
if (logmatchTable[logmatchCount].frequency > 0) { |
614fab3c797e
17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
23 |
snmp_alarm_register(logmatchTable[logmatchCount].frequency, |
5867
445e2cf1c845
PSARC/2014/169 Net-snmp upgrade to version 5.7.2.1
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents:
1776
diff
changeset
|
24 |
@@ -469,8 +480,8 @@ |
445e2cf1c845
PSARC/2014/169 Net-snmp upgrade to version 5.7.2.1
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents:
1776
diff
changeset
|
25 |
*/ |
445e2cf1c845
PSARC/2014/169 Net-snmp upgrade to version 5.7.2.1
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents:
1776
diff
changeset
|
26 |
|
445e2cf1c845
PSARC/2014/169 Net-snmp upgrade to version 5.7.2.1
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents:
1776
diff
changeset
|
27 |
for (i = 0; i < logmatchCount; i++) { |
445e2cf1c845
PSARC/2014/169 Net-snmp upgrade to version 5.7.2.1
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents:
1776
diff
changeset
|
28 |
- |
445e2cf1c845
PSARC/2014/169 Net-snmp upgrade to version 5.7.2.1
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents:
1776
diff
changeset
|
29 |
- regfree(&(logmatchTable[i].regexBuffer)); |
445e2cf1c845
PSARC/2014/169 Net-snmp upgrade to version 5.7.2.1
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents:
1776
diff
changeset
|
30 |
+ if (logmatchTable[i].myRegexError == 0) |
445e2cf1c845
PSARC/2014/169 Net-snmp upgrade to version 5.7.2.1
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents:
1776
diff
changeset
|
31 |
+ regfree(&(logmatchTable[i].regexBuffer)); |
445e2cf1c845
PSARC/2014/169 Net-snmp upgrade to version 5.7.2.1
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents:
1776
diff
changeset
|
32 |
} |
445e2cf1c845
PSARC/2014/169 Net-snmp upgrade to version 5.7.2.1
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents:
1776
diff
changeset
|
33 |
logmatchCount = 0; |
445e2cf1c845
PSARC/2014/169 Net-snmp upgrade to version 5.7.2.1
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents:
1776
diff
changeset
|
34 |
} |