Resolves: RHEL-44357 - fix unexpected header length in /proc/net/snmp
Signed-off-by: Josef Řídký <jridky@redhat.com>
This commit is contained in:
Josef Řídký
parent
d585f82165
commit
d9b0434c3d
120
net-snmp-5.9.4-kernel-6.7.patch
Normal file
120
net-snmp-5.9.4-kernel-6.7.patch
Normal file
@ -0,0 +1,120 @@
|
|||||||
|
From f5ae6baf0018abda9dedc368fe6d52c0d7a8ab8f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Philippe Troin <phil+github-commits@fifi.org>
|
||||||
|
Date: Sat, 3 Feb 2024 10:30:30 -0800
|
||||||
|
Subject: [PATCH] Add Linux 6.7 compatibility parsing /proc/net/snmp
|
||||||
|
|
||||||
|
Linux 6.7 adds a new OutTransmits field to Ip in /proc/net/snmp.
|
||||||
|
This breaks the hard-coded assumptions about the Ip line length.
|
||||||
|
Add compatibility to parse Linux 6.7 Ip header while keep support
|
||||||
|
for previous versions.
|
||||||
|
---
|
||||||
|
.../ip-mib/data_access/systemstats_linux.c | 46 +++++++++++++++----
|
||||||
|
1 file changed, 37 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/agent/mibgroup/ip-mib/data_access/systemstats_linux.c b/agent/mibgroup/ip-mib/data_access/systemstats_linux.c
|
||||||
|
index 49e0a34d5c..f04e828a94 100644
|
||||||
|
--- a/agent/mibgroup/ip-mib/data_access/systemstats_linux.c
|
||||||
|
+++ b/agent/mibgroup/ip-mib/data_access/systemstats_linux.c
|
||||||
|
@@ -36,7 +36,7 @@ netsnmp_access_systemstats_arch_init(void)
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
- /proc/net/snmp
|
||||||
|
+ /proc/net/snmp - Linux 6.6 and lower
|
||||||
|
|
||||||
|
Ip: Forwarding DefaultTTL InReceives InHdrErrors InAddrErrors ForwDatagrams InUnknownProtos InDiscards InDelivers OutRequests OutDiscards OutNoRoutes ReasmTimeout ReasmReqds ReasmOKs ReasmFails FragOKs FragFails FragCreates
|
||||||
|
Ip: 2 64 7083534 0 0 0 0 0 6860233 6548963 0 0 1 286623 63322 1 259920 0 0
|
||||||
|
@@ -49,6 +49,26 @@ netsnmp_access_systemstats_arch_init(void)
|
||||||
|
|
||||||
|
Udp: InDatagrams NoPorts InErrors OutDatagrams
|
||||||
|
Udp: 1491094 122 0 1466178
|
||||||
|
+*
|
||||||
|
+ /proc/net/snmp - Linux 6.7 and higher
|
||||||
|
+
|
||||||
|
+ Ip: Forwarding DefaultTTL InReceives InHdrErrors InAddrErrors ForwDatagrams InUnknownProtos InDiscards InDelivers OutRequests OutDiscards OutNoRoutes ReasmTimeout ReasmReqds ReasmOKs ReasmFails FragOKs FragFails FragCreates OutTransmits
|
||||||
|
+ Ip: 1 64 50859058 496 0 37470604 0 0 20472980 7515791 1756 0 0 7264 3632 0 3548 0 7096 44961424
|
||||||
|
+
|
||||||
|
+ Icmp: InMsgs InErrors InCsumErrors InDestUnreachs InTimeExcds InParmProbs InSrcQuenchs InRedirects InEchos InEchoReps InTimestamps InTimestampReps InAddrMasks InAddrMaskReps OutMsgs OutErrors OutRateLimitGlobal OutRateLimitHost OutDestUnreachs OutTimeExcds OutParmProbs OutSrcQuenchs OutRedirects OutEchos OutEchoReps OutTimestamps OutTimestampReps OutAddrMasks OutAddrMaskReps
|
||||||
|
+ Icmp: 114447 2655 0 17589 0 0 0 0 66905 29953 0 0 0 0 143956 0 0 572 16610 484 0 0 0 59957 66905 0 0 0 0
|
||||||
|
+
|
||||||
|
+ IcmpMsg: InType0 InType3 InType8 OutType0 OutType3 OutType8 OutType11
|
||||||
|
+ IcmpMsg: 29953 17589 66905 66905 16610 59957 484
|
||||||
|
+
|
||||||
|
+ Tcp: RtoAlgorithm RtoMin RtoMax MaxConn ActiveOpens PassiveOpens AttemptFails EstabResets CurrEstab InSegs OutSegs RetransSegs InErrs OutRsts InCsumErrors
|
||||||
|
+ Tcp: 1 200 120000 -1 17744 13525 307 3783 6 18093137 9277788 3499 8 7442 0
|
||||||
|
+
|
||||||
|
+ Udp: InDatagrams NoPorts InErrors OutDatagrams RcvbufErrors SndbufErrors InCsumErrors IgnoredMulti MemErrors
|
||||||
|
+ Udp: 2257832 1422 0 2252835 0 0 0 84 0
|
||||||
|
+
|
||||||
|
+ UdpLite: InDatagrams NoPorts InErrors OutDatagrams RcvbufErrors SndbufErrors InCsumErrors IgnoredMulti MemErrors
|
||||||
|
+ UdpLite: 0 0 0 0 0 0 0 0 0
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
@@ -101,10 +121,10 @@ _systemstats_v4(netsnmp_container* container, u_int load_flags)
|
||||||
|
FILE *devin;
|
||||||
|
char line[1024];
|
||||||
|
netsnmp_systemstats_entry *entry = NULL;
|
||||||
|
- int scan_count;
|
||||||
|
+ int scan_count, expected_scan_count;
|
||||||
|
char *stats, *start = line;
|
||||||
|
int len;
|
||||||
|
- unsigned long long scan_vals[19];
|
||||||
|
+ unsigned long long scan_vals[20];
|
||||||
|
|
||||||
|
DEBUGMSGTL(("access:systemstats:container:arch", "load v4 (flags %x)\n",
|
||||||
|
load_flags));
|
||||||
|
@@ -126,10 +146,17 @@ _systemstats_v4(netsnmp_container* container, u_int load_flags)
|
||||||
|
*/
|
||||||
|
NETSNMP_IGNORE_RESULT(fgets(line, sizeof(line), devin));
|
||||||
|
len = strlen(line);
|
||||||
|
- if (224 != len) {
|
||||||
|
+ switch (len) {
|
||||||
|
+ case 224:
|
||||||
|
+ expected_scan_count = 19;
|
||||||
|
+ break;
|
||||||
|
+ case 237:
|
||||||
|
+ expected_scan_count = 20;
|
||||||
|
+ break;
|
||||||
|
+ default:
|
||||||
|
fclose(devin);
|
||||||
|
snmp_log(LOG_ERR, "systemstats_linux: unexpected header length in /proc/net/snmp."
|
||||||
|
- " %d != 224\n", len);
|
||||||
|
+ " %d not in { 224, 237 } \n", len);
|
||||||
|
return -4;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -178,20 +205,20 @@ _systemstats_v4(netsnmp_container* container, u_int load_flags)
|
||||||
|
memset(scan_vals, 0x0, sizeof(scan_vals));
|
||||||
|
scan_count = sscanf(stats,
|
||||||
|
"%llu %llu %llu %llu %llu %llu %llu %llu %llu %llu"
|
||||||
|
- "%llu %llu %llu %llu %llu %llu %llu %llu %llu",
|
||||||
|
+ "%llu %llu %llu %llu %llu %llu %llu %llu %llu %llu",
|
||||||
|
&scan_vals[0],&scan_vals[1],&scan_vals[2],
|
||||||
|
&scan_vals[3],&scan_vals[4],&scan_vals[5],
|
||||||
|
&scan_vals[6],&scan_vals[7],&scan_vals[8],
|
||||||
|
&scan_vals[9],&scan_vals[10],&scan_vals[11],
|
||||||
|
&scan_vals[12],&scan_vals[13],&scan_vals[14],
|
||||||
|
&scan_vals[15],&scan_vals[16],&scan_vals[17],
|
||||||
|
- &scan_vals[18]);
|
||||||
|
+ &scan_vals[18],&scan_vals[19]);
|
||||||
|
DEBUGMSGTL(("access:systemstats", " read %d values\n", scan_count));
|
||||||
|
|
||||||
|
- if(scan_count != 19) {
|
||||||
|
+ if(scan_count != expected_scan_count) {
|
||||||
|
snmp_log(LOG_ERR,
|
||||||
|
"error scanning systemstats data (expected %d, got %d)\n",
|
||||||
|
- 19, scan_count);
|
||||||
|
+ expected_scan_count, scan_count);
|
||||||
|
netsnmp_access_systemstats_entry_free(entry);
|
||||||
|
return -4;
|
||||||
|
}
|
||||||
|
@@ -223,6 +250,7 @@ _systemstats_v4(netsnmp_container* container, u_int load_flags)
|
||||||
|
entry->stats.HCOutFragFails.high = scan_vals[17] >> 32;
|
||||||
|
entry->stats.HCOutFragCreates.low = scan_vals[18] & 0xffffffff;
|
||||||
|
entry->stats.HCOutFragCreates.high = scan_vals[18] >> 32;
|
||||||
|
+ /* entry->stats. = scan_vals[19]; / * OutTransmits */
|
||||||
|
|
||||||
|
entry->stats.columnAvail[IPSYSTEMSTATSTABLE_HCINRECEIVES] = 1;
|
||||||
|
entry->stats.columnAvail[IPSYSTEMSTATSTABLE_INHDRERRORS] = 1;
|
||||||
|
|
||||||
@ -10,7 +10,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.9.1
|
Version: 5.9.1
|
||||||
Release: 15%{?dist}
|
Release: 16%{?dist}
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
|
|
||||||
License: BSD
|
License: BSD
|
||||||
@ -58,6 +58,7 @@ Patch28: net-snmp-5.9-sendmsg-error-code.patch
|
|||||||
Patch29: net-snmp-5.9-message-severity.patch
|
Patch29: net-snmp-5.9-message-severity.patch
|
||||||
Patch30: net-snmp-5.9-rpmdb.patch
|
Patch30: net-snmp-5.9-rpmdb.patch
|
||||||
Patch31: net-snmp-5.9-CVE-2022-24805-24810.patch
|
Patch31: net-snmp-5.9-CVE-2022-24805-24810.patch
|
||||||
|
Patch32: net-snmp-5.9.4-kernel-6.7.patch
|
||||||
|
|
||||||
# Modern RPM API means at least EL6
|
# Modern RPM API means at least EL6
|
||||||
Patch101: net-snmp-5.8-modern-rpm-api.patch
|
Patch101: net-snmp-5.8-modern-rpm-api.patch
|
||||||
@ -241,6 +242,7 @@ cp %{SOURCE10} .
|
|||||||
%patch29 -p1 -b .message-severity
|
%patch29 -p1 -b .message-severity
|
||||||
%patch30 -p1 -b .rpmdb
|
%patch30 -p1 -b .rpmdb
|
||||||
%patch31 -p1 -b .CVE-2022-24805-24810
|
%patch31 -p1 -b .CVE-2022-24805-24810
|
||||||
|
%patch32 -p1 -b .kernel-6.7-fix
|
||||||
|
|
||||||
%patch101 -p1 -b .modern-rpm-api
|
%patch101 -p1 -b .modern-rpm-api
|
||||||
%patch102 -p1
|
%patch102 -p1
|
||||||
@ -510,6 +512,9 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make test
|
|||||||
%{_libdir}/libnetsnmptrapd*.so.%{soname}*
|
%{_libdir}/libnetsnmptrapd*.so.%{soname}*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jun 21 2024 Josef Ridky <jridky@redhat.com> - 1:5.9.1-16
|
||||||
|
- fix unexpected header length in /proc/net/snmp (RHEL-44357)
|
||||||
|
|
||||||
* Tue Apr 09 2024 Josef Ridky <jridky@redhat.com> - 1:5.9.1-15
|
* Tue Apr 09 2024 Josef Ridky <jridky@redhat.com> - 1:5.9.1-15
|
||||||
- fix changelog issue
|
- fix changelog issue
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user