diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-09 12:28:35 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-09 12:28:35 +0200 |
| commit | 41043f3f0769feb3ef8f826006c6f863b1ae06fa (patch) | |
| tree | fb1e5293e00ae538092b78288f5828a2fd4b8145 | |
| parent | d788daafa4e8bda5fe544718b5f420f22cd79996 (diff) | |
| parent | 9bea045e60fa612336ae6a78267284bcec2e9e25 (diff) | |
| download | rsyslog-41043f3f0769feb3ef8f826006c6f863b1ae06fa.tar.gz rsyslog-41043f3f0769feb3ef8f826006c6f863b1ae06fa.tar.xz rsyslog-41043f3f0769feb3ef8f826006c6f863b1ae06fa.zip | |
Merge branch 'v4-stable' into v5-stable
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | runtime/net.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -857,6 +857,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)) |