diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-09 12:32:36 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-09 12:32:36 +0200 |
| commit | 26220bb426802aa5c07a1904575ddd0d6a3de177 (patch) | |
| tree | 92f9aa06a0e9f31a700785f3df5ea11b13a1d40c | |
| parent | 77b93c21711c35d5935f3d55fb74968491cd133a (diff) | |
| parent | 98e4e10ac1a2d00c895a283e50fd76e9f7f07b3d (diff) | |
| download | rsyslog-26220bb426802aa5c07a1904575ddd0d6a3de177.tar.gz rsyslog-26220bb426802aa5c07a1904575ddd0d6a3de177.tar.xz rsyslog-26220bb426802aa5c07a1904575ddd0d6a3de177.zip | |
Merge branch 'beta'
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | runtime/net.c | 2 |
2 files changed, 10 insertions, 1 deletions
@@ -50,6 +50,9 @@ Version 6.3.2 [DEVEL] (rgerhards), 2011-07-06 --------------------------------------------------------------------------- Version 6.1.12 [BETA] (al), 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 6.1.11 [BETA] (rgerhards), 2011-07-11 - systemd support: set stdout/stderr to null - thx to Lennart for the patch @@ -344,6 +347,9 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-06-08 --------------------------------------------------------------------------- Version 5.8.4 [V5-stable] (al), 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 5.8.3 [V5-stable] (rgerhards), 2011-07-11 - systemd support: set stdout/stderr to null - thx to Lennart for the patch @@ -1203,6 +1209,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 41a344ab..e1e25df8 100644 --- a/runtime/net.c +++ b/runtime/net.c @@ -723,7 +723,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)) |