[Pkg-net-snmp-commits] [pkg-net-snmp] 05/05: update {CVE-2012-2141, TrapReceiver, agentx-crash}.patch
Hideki Yamane
henrich at moszumanska.debian.org
Mon Sep 15 15:19:29 UTC 2014
This is an automated email from the git hooks/post-receive script.
henrich pushed a commit to branch squeeze
in repository pkg-net-snmp.
commit 94c0b5feb702c8403d02d00735a08ee036f0f5a7
Author: Hideki Yamane <henrich at debian.org>
Date: Sun May 4 13:48:35 2014 +0900
update {CVE-2012-2141,TrapReceiver,agentx-crash}.patch
---
debian/patches/CVE-2012-2141.patch | 6 +++---
debian/patches/TrapReceiver.patch | 16 +++++++++-------
debian/patches/agentx-crash.patch | 30 +++++++++++++++++-------------
3 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/debian/patches/CVE-2012-2141.patch b/debian/patches/CVE-2012-2141.patch
index 1c6de22..30c5b8e 100644
--- a/debian/patches/CVE-2012-2141.patch
+++ b/debian/patches/CVE-2012-2141.patch
@@ -5,10 +5,10 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672492
Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=815813
Origin: upstream, http://net-snmp.git.sourceforge.net/git/gitweb.cgi?p=net-snmp/net-snmp;a=commit;h=4c5633f1603e4bd03ed05c37d782ec8911759c47
-Index: net-snmp-5.4.3~dfsg/agent/mibgroup/agent/extend.c
+Index: net-snmp/agent/mibgroup/agent/extend.c
===================================================================
---- net-snmp-5.4.3~dfsg.orig/agent/mibgroup/agent/extend.c 2013-04-06 15:06:10.934136272 +0900
-+++ net-snmp-5.4.3~dfsg/agent/mibgroup/agent/extend.c 2013-04-06 15:06:10.922136274 +0900
+--- net-snmp.orig/agent/mibgroup/agent/extend.c 2014-05-04 13:39:43.555300359 +0900
++++ net-snmp/agent/mibgroup/agent/extend.c 2014-05-04 13:39:43.555300359 +0900
@@ -1124,7 +1124,7 @@
* ...and check the line requested is valid
*/
diff --git a/debian/patches/TrapReceiver.patch b/debian/patches/TrapReceiver.patch
index 0973f83..726693f 100644
--- a/debian/patches/TrapReceiver.patch
+++ b/debian/patches/TrapReceiver.patch
@@ -3,28 +3,30 @@ Origin: upstream
Bug: http://sourceforge.net/p/net-snmp/code/ci/76e8d6d100320629d8a23be4b0128619600c919d/
Last-Update: 2014-03-30
---- net-snmp-5.7.2.1~dfsg.orig/perl/TrapReceiver/TrapReceiver.xs
-+++ net-snmp-5.7.2.1~dfsg/perl/TrapReceiver/TrapReceiver.xs
-@@ -81,18 +81,18 @@ int perl_trapd_handler( netsnmp_pdu
+Index: net-snmp/perl/TrapReceiver/TrapReceiver.xs
+===================================================================
+--- net-snmp.orig/perl/TrapReceiver/TrapReceiver.xs 2014-05-04 13:39:54.243345566 +0900
++++ net-snmp/perl/TrapReceiver/TrapReceiver.xs 2014-05-04 13:43:41.268252843 +0900
+@@ -76,18 +76,18 @@
STOREPDUi("securitymodel", pdu->securityModel);
STOREPDUi("securitylevel", pdu->securityLevel);
STOREPDU("contextName",
- newSVpv(pdu->contextName, pdu->contextNameLen));
+ newSVpv(pdu->contextName ? pdu->contextName : "", pdu->contextNameLen));
STOREPDU("contextEngineID",
-- newSVpv((char *) pdu->contextEngineID,
+- newSVpv(pdu->contextEngineID,
+ newSVpv(pdu->contextEngineID ? (char *) pdu->contextEngineID : "",
pdu->contextEngineIDLen));
STOREPDU("securityEngineID",
-- newSVpv((char *) pdu->securityEngineID,
+- newSVpv(pdu->securityEngineID,
+ newSVpv(pdu->securityEngineID ? (char *) pdu->securityEngineID : "",
pdu->securityEngineIDLen));
STOREPDU("securityName",
-- newSVpv((char *) pdu->securityName, pdu->securityNameLen));
+- newSVpv(pdu->securityName, pdu->securityNameLen));
+ newSVpv(pdu->securityName ? (char *) pdu->securityName : "", pdu->securityNameLen));
} else {
STOREPDU("community",
-- newSVpv((char *) pdu->community, pdu->community_len));
+- newSVpv(pdu->community, pdu->community_len));
+ newSVpv(pdu->community ? (char *) pdu->community : "", pdu->community_len));
}
diff --git a/debian/patches/agentx-crash.patch b/debian/patches/agentx-crash.patch
index 00988cc..c1879e2 100644
--- a/debian/patches/agentx-crash.patch
+++ b/debian/patches/agentx-crash.patch
@@ -1,6 +1,6 @@
Description: fix snmpd crash via AgentX connection
- taken from Fedora, net-snmp-5.7-agentx-crash.patch
+ based patch taken from Fedora, net-snmp-5.7-agentx-crash.patch
bz729738 - net-snmp dumps core in netsnmp_oid_find_prefix
bz1038011 - net-snmp: snmpd crashes/hangs when AgentX subagent times-out
@@ -16,13 +16,15 @@ Date: Tue Feb 7 14:53:44 2012 +0100
Origin: vendor
Forwarded: not-needed
-Last-Update: <YYYY-MM-DD>
+Last-Update: 2014-05-04
---- net-snmp-5.7.2~dfsg.orig/agent/mibgroup/agentx/master.c
-+++ net-snmp-5.7.2~dfsg/agent/mibgroup/agentx/master.c
-@@ -219,6 +219,9 @@ agentx_got_response(int operation,
+Index: net-snmp/agent/mibgroup/agentx/master.c
+===================================================================
+--- net-snmp.orig/agent/mibgroup/agentx/master.c 2014-05-04 13:44:48.392509904 +0900
++++ net-snmp/agent/mibgroup/agentx/master.c 2014-05-04 13:46:08.756817985 +0900
+@@ -236,6 +236,9 @@
if (!cache) {
- DEBUGMSGTL(("agentx/master", "response too late on session %8p\n",
+ DEBUGMSGTL(("agentx/master", "response too late on session %08p\n",
session));
+ /* response is too late, free the cache */
+ if (magic)
@@ -30,18 +32,20 @@ Last-Update: <YYYY-MM-DD>
return 0;
}
requests = cache->requests;
-@@ -606,6 +609,8 @@ agentx_master_handler(netsnmp_mib_handle
- result = snmp_async_send(ax_session, pdu, agentx_got_response, cb_data);
- if (result == 0) {
- snmp_free_pdu(pdu);
+@@ -621,6 +624,8 @@
+
+ if (result == 0 ) {
+ snmp_free_pdu( pdu );
+ if (cb_data)
+ netsnmp_free_delegated_cache((netsnmp_delegated_cache*) cb_data);
}
return SNMP_ERR_NOERROR;
---- net-snmp-5.7.2~dfsg.orig/agent/mibgroup/agentx/master_admin.c
-+++ net-snmp-5.7.2~dfsg/agent/mibgroup/agentx/master_admin.c
-@@ -133,11 +133,16 @@ close_agentx_session(netsnmp_session * s
+Index: net-snmp/agent/mibgroup/agentx/master_admin.c
+===================================================================
+--- net-snmp.orig/agent/mibgroup/agentx/master_admin.c 2014-05-04 13:44:48.392509904 +0900
++++ net-snmp/agent/mibgroup/agentx/master_admin.c 2014-05-04 13:44:48.392509904 +0900
+@@ -139,11 +139,16 @@
* requests, so that the delegated request will be completed and
* further requests can be processed
*/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-net-snmp/pkg-net-snmp.git
More information about the Pkg-net-snmp-commits
mailing list