mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 04:17:25 +00:00
Armin Kuster
5b2e937448
SQUID-2015:2 - Does not affect Squid-3.4 and older versions are not vulnerable. CVE-2015-5400 CVE-2015-3455 CVE-2014-7142 CVE-2014-7141 CVE-2014-6270 see http://www.squid-cache.org/Advisories/ Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
62 lines
2.0 KiB
Diff
62 lines
2.0 KiB
Diff
Fix: CVE-2014-3609
|
|
|
|
revno: 13172
|
|
revision-id: squid3@treenet.co.nz-20140915045834-qo85nnsinp9wu4gt
|
|
parent: squid3@treenet.co.nz-20140827142207-n6y0r0iuv4sq6hvg
|
|
author: Sebastian Krahmer <krahmer@suse.com>
|
|
committer: Amos Jeffries <squid3@treenet.co.nz>
|
|
branch nick: 3.4
|
|
timestamp: Sun 2014-09-14 22:58:34 -0600
|
|
message:
|
|
Fix off by one in SNMP subsystem
|
|
------------------------------------------------------------
|
|
# Bazaar merge directive format 2 (Bazaar 0.90)
|
|
# revision_id: squid3@treenet.co.nz-20140915045834-qo85nnsinp9wu4gt
|
|
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
|
|
# testament_sha1: 72ffc18d9c25a0412efc813dc5cde1c63e8ebe46
|
|
# timestamp: 2014-09-15 11:08:17 +0000
|
|
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
|
|
# base_revision_id: squid3@treenet.co.nz-20140827142207-\
|
|
# n6y0r0iuv4sq6hvg
|
|
#
|
|
# Begin patch
|
|
|
|
Upstream-Status: Backport
|
|
|
|
http://www.squid-cache.org/Versions/v3/3.4/changesets/squid-3.4-13172.patch
|
|
|
|
Signed-of-by: Armin Kuster <akuster@mvista.com>
|
|
|
|
=== modified file 'src/snmp_core.cc'
|
|
--- a/src/snmp_core.cc 2014-02-18 08:46:49 +0000
|
|
+++ b/src/snmp_core.cc 2014-09-15 04:58:34 +0000
|
|
@@ -362,7 +362,7 @@
|
|
void
|
|
snmpHandleUdp(int sock, void *not_used)
|
|
{
|
|
- LOCAL_ARRAY(char, buf, SNMP_REQUEST_SIZE);
|
|
+ static char buf[SNMP_REQUEST_SIZE];
|
|
Ip::Address from;
|
|
SnmpRequest *snmp_rq;
|
|
int len;
|
|
@@ -371,16 +371,11 @@
|
|
|
|
Comm::SetSelect(sock, COMM_SELECT_READ, snmpHandleUdp, NULL, 0);
|
|
|
|
- memset(buf, '\0', SNMP_REQUEST_SIZE);
|
|
+ memset(buf, '\0', sizeof(buf));
|
|
|
|
- len = comm_udp_recvfrom(sock,
|
|
- buf,
|
|
- SNMP_REQUEST_SIZE,
|
|
- 0,
|
|
- from);
|
|
+ len = comm_udp_recvfrom(sock, buf, sizeof(buf)-1, 0, from);
|
|
|
|
if (len > 0) {
|
|
- buf[len] = '\0';
|
|
debugs(49, 3, "snmpHandleUdp: FD " << sock << ": received " << len << " bytes from " << from << ".");
|
|
|
|
snmp_rq = (SnmpRequest *)xcalloc(1, sizeof(SnmpRequest));
|
|
|