diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-09 12:31:48 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-09 12:31:48 +0200 |
| commit | 8d962ca3514c0414c29170152369eb1d59276e3f (patch) | |
| tree | c9a39efda50d06689212a8a2d2a2d07192f06e7e | |
| parent | ece1cb640926848d0d155f29b01a6406af441cb0 (diff) | |
| parent | d28f4610657672220999eacd5aa2f5a25d994c42 (diff) | |
| download | rsyslog-8d962ca3514c0414c29170152369eb1d59276e3f.tar.gz rsyslog-8d962ca3514c0414c29170152369eb1d59276e3f.tar.xz rsyslog-8d962ca3514c0414c29170152369eb1d59276e3f.zip | |
Merge branch 'v5-stable' into beta
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | runtime/net.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -216,6 +216,9 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-03-?? --------------------------------------------------------------------------- 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 @@ -1073,6 +1076,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 789790f6..4781739f 100644 --- a/runtime/net.c +++ b/runtime/net.c @@ -722,7 +722,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)) |