rpms/net-snmp
8
0
Fork 0
Code Issues Pull Requests Releases Activity

Upstream iterator fix

Browse Source
This commit is contained in:
Josef Ridky 2018-03-27 10:55:06 +02:00
parent a99b865945
commit 3d45358cc7
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net-snmp-5.7.3-iterator-fix.patch
View File

@ -1,14 +1,14 @@
diff -urNp old/agent/mibgroup/host/data_access/swrun.c new/agent/mibgroup/host/data_access/swrun.c diff -urNp old/agent/mibgroup/host/data_access/swrun.c new/agent/mibgroup/host/data_access/swrun.c
--- old/agent/mibgroup/host/data_access/swrun.c 2017-07-18 09:44:00.626109526 +0200 --- old/agent/mibgroup/host/data_access/swrun.c 2018-03-26 09:00:39.932335587 +0200
+++ new/agent/mibgroup/host/data_access/swrun.c 2017-07-19 15:27:50.452255836 +0200 +++ new/agent/mibgroup/host/data_access/swrun.c 2018-03-26 09:03:00.845876681 +0200
@@ -102,6 +102,10 @@ swrun_count_processes_by_name( char *nam @@ -102,7 +102,9 @@ swrun_count_processes_by_name( char *nam
return 0; /* or -1 */ return 0; /* or -1 */
it = CONTAINER_ITERATOR( swrun_container ); it = CONTAINER_ITERATOR( swrun_container );
+ if((entry = (netsnmp_swrun_entry*)ITERATOR_FIRST( it )) != NULL) { - while ((entry = (netsnmp_swrun_entry*)ITERATOR_NEXT( it )) != NULL) {
+ if (0 == strcmp( entry->hrSWRunName, name )) + for (entry = (netsnmp_swrun_entry*)ITERATOR_FIRST( it );
+ i++; + entry;
+ } + entry = (netsnmp_swrun_entry*)ITERATOR_NEXT( it )) {
while ((entry = (netsnmp_swrun_entry*)ITERATOR_NEXT( it )) != NULL) {
if (0 == strcmp( entry->hrSWRunName, name )) if (0 == strcmp( entry->hrSWRunName, name ))
i++; i++;
}

5
net-snmp.spec
View File

@ -7,7 +7,7 @@
Summary: A collection of SNMP protocol tools and libraries Summary: A collection of SNMP protocol tools and libraries
Name: net-snmp Name: net-snmp
Version: 5.7.3 Version: 5.7.3
Release: 36%{?dist} Release: 37%{?dist}
Epoch: 1 Epoch: 1
License: BSD License: BSD
@ -494,6 +494,9 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make test
%{_libdir}/libnetsnmptrapd*.so.* %{_libdir}/libnetsnmptrapd*.so.*
%changelog %changelog
* Tue Mar 27 2018 Josef Ridky <jridky@redhat.com> - 1:5.7.3-37
- backport upstream patch for structure iterator
* Thu Mar 08 2018 Josef Ridky <jridky@redhat.com> - 1:5.7.3-36 * Thu Mar 08 2018 Josef Ridky <jridky@redhat.com> - 1:5.7.3-36
- CVE-2018-1000116 Heap corruption in snmp_pdu_parse (#1552844) - CVE-2018-1000116 Heap corruption in snmp_pdu_parse (#1552844)