diff options
| author |   Tobias Scherbaum <dertobi123@gentoo.org> | 2009-07-11 08:05:48 +0000 |
|---|---|---|
| committer | Tobias Scherbaum <dertobi123@gentoo.org> | 2009-07-11 08:05:48 +0000 |
| commit | 236d1044ac101c020d834817efa9c37dabdeef9b (patch) | |
| tree | d3286bab17336ff616fbef92ab9ac9c1142d8c13 /net-analyzer | |
| parent | x11-drivers/xf86-input-dynapro: drop old ebuilds (diff) | |
| download | gentoo-2-236d1044ac101c020d834817efa9c37dabdeef9b.tar.gz gentoo-2-236d1044ac101c020d834817efa9c37dabdeef9b.tar.bz2 gentoo-2-236d1044ac101c020d834817efa9c37dabdeef9b.zip | |
Update patch for CVE-2008-6123
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/net-snmp/ChangeLog | 6 | ||||
| -rw-r--r-- | net-analyzer/net-snmp/files/CVE-2008-6123.patch | 31 |
2 files changed, 5 insertions, 32 deletions
diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog index ed1e5ffde637..d9032d0fc699 100644 --- a/net-analyzer/net-snmp/ChangeLog +++ b/net-analyzer/net-snmp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/net-snmp # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.191 2009/07/10 21:58:28 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.192 2009/07/11 08:05:48 dertobi123 Exp $ + + 11 Jul 2009; Tobias Scherbaum <dertobi123@gentoo.org> + files/CVE-2008-6123.patch: + Update patch for CVE-2008-6123 *net-snmp-5.4.2.1-r1 (10 Jul 2009) diff --git a/net-analyzer/net-snmp/files/CVE-2008-6123.patch b/net-analyzer/net-snmp/files/CVE-2008-6123.patch index 557d71b85539..b4b06f63e9f1 100644 --- a/net-analyzer/net-snmp/files/CVE-2008-6123.patch +++ b/net-analyzer/net-snmp/files/CVE-2008-6123.patch @@ -1,19 +1,6 @@ diff -Naur snmplib.orig/snmpUDPDomain.c snmplib/snmpUDPDomain.c --- snmplib.orig/snmpUDPDomain.c 2007-10-11 22:46:30.000000000 +0200 +++ snmplib/snmpUDPDomain.c 2009-07-10 23:41:37.000000000 +0200 -@@ -65,6 +65,12 @@ - #define INADDR_NONE -1 - #endif - -+#ifdef MSG_DONTWAIT -+#define NETSNMP_DONTWAIT MSG_DONTWAIT -+#else -+#define NETSNMP_DONTWAIT 0 -+#endif -+ - static netsnmp_tdomain udpDomain; - - typedef struct netsnmp_udp_addr_pair_s { @@ -104,12 +110,12 @@ char tmp[64]; to = (struct sockaddr_in *) &(addr_pair->remote_addr); @@ -30,21 +17,3 @@ diff -Naur snmplib.orig/snmpUDPDomain.c snmplib/snmpUDPDomain.c } return strdup(tmp); } -@@ -140,7 +146,7 @@ - msg.msg_control = &cmsg; - msg.msg_controllen = sizeof(cmsg); - -- r = recvmsg(s, &msg, 0); -+ r = recvmsg(s, &msg, NETSNMP_DONTWAIT); - - if (r == -1) { - return -1; -@@ -215,7 +221,7 @@ - #if defined(linux) && defined(IP_PKTINFO) - rc = netsnmp_udp_recvfrom(t->sock, buf, size, from, &fromlen, &(addr_pair->local_addr)); - #else -- rc = recvfrom(t->sock, buf, size, 0, from, &fromlen); -+ rc = recvfrom(t->sock, buf, size, NETSNMP_DONTWAIT, from, &fromlen); - #endif /* linux && IP_PKTINFO */ - if (rc < 0 && errno != EINTR) { - break; |