summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-08-09 12:26:53 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-08-09 12:26:53 +0200
commitb882a009284547852efbfee65c2348f729ff7053 (patch)
treece3d749a677bab59b78d81290427a9d6453d1f07
parenta8f2fd6eb4acf7484a6de53f2175c24a2d4b4cc3 (diff)
parent9bea045e60fa612336ae6a78267284bcec2e9e25 (diff)
downloadrsyslog-b882a009284547852efbfee65c2348f729ff7053.tar.gz
rsyslog-b882a009284547852efbfee65c2348f729ff7053.tar.xz
rsyslog-b882a009284547852efbfee65c2348f729ff7053.zip
Merge branch 'v4-stable' into v4-beta
-rw-r--r--ChangeLog3
-rw-r--r--runtime/net.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7e958ce3..c01ff838 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -80,6 +80,9 @@ Version 4.7.0 [v4-devel] (rgerhards), 2010-04-14
---------------------------------------------------------------------------
Version 4.6.8 [v4-stable] (rgerhards), 2011-??-??
- bugfix: potential misadressing in property replacer
+- bugfix: memcpy overflow can occur in allowed sender checkig
+ if a name is resolved to IPv4-mapped-on-IPv6 address
+ Found by Ismail Dönmez at suse
---------------------------------------------------------------------------
Version 4.6.7 [v4-stable] (rgerhards), 2011-07-11
- added support for the ":omusrmsg:" syntax in configuring user messages
diff --git a/runtime/net.c b/runtime/net.c
index 4eb5a3bb..8fd8cc2b 100644
--- a/runtime/net.c
+++ b/runtime/net.c
@@ -721,7 +721,7 @@ static rsRetVal AddAllowedSender(struct AllowedSenders **ppRoot, struct AllowedS
SIN(allowIP.addr.NetAddr)->sin_port = 0;
memcpy(&(SIN(allowIP.addr.NetAddr)->sin_addr.s_addr),
&(SIN6(res->ai_addr)->sin6_addr.s6_addr32[3]),
- sizeof (struct sockaddr_in));
+ sizeof (in_addr_t));
if((iRet = AddAllowedSenderEntry(ppRoot, ppLast, &allowIP,
iSignificantBits))