diff options
| author | Eygene Ryabinkin <rea@FreeBSD.org> | 2012-09-04 11:54:30 +0000 |
|---|---|---|
| committer | Eygene Ryabinkin <rea@FreeBSD.org> | 2012-09-04 11:54:30 +0000 |
| commit | 856c67486ed236fa6d189ac8f328031a801126eb (patch) | |
| tree | 0e018abf2855ae7033d21249a07ea3b0a6478cb9 /net-im | |
| parent | upgrade to 0.9.1. (diff) | |
net-im/jabberd: fix CVE-2012-3525
PR: ports/170894
Approved by: maintainer timeout (2 weeks)
Security: http://www.vuxml.org/freebsd/4d1d2f6d-ec94-11e1-8bd8-0022156e8794.html
QA page: http://codelabs.ru/fbsd/ports/qa/net-im/jabberd/2.2.16_2
Notes
Notes:
svn path=/head/; revision=303651
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/jabberd/Makefile | 2 | ||||
| -rw-r--r-- | net-im/jabberd/files/patch-cve-2012-3525 | 25 |
2 files changed, 26 insertions, 1 deletions
diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile index b83568afb11b..b22e633b4fe5 100644 --- a/net-im/jabberd/Makefile +++ b/net-im/jabberd/Makefile @@ -7,7 +7,7 @@ PORTNAME= jabberd PORTVERSION= 2.2.16 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MASTER_SITES= http://cloud.github.com/downloads/Jabberd2/jabberd2/ DIST_SUBDIR= jabber diff --git a/net-im/jabberd/files/patch-cve-2012-3525 b/net-im/jabberd/files/patch-cve-2012-3525 new file mode 100644 index 000000000000..a9afdbd9af20 --- /dev/null +++ b/net-im/jabberd/files/patch-cve-2012-3525 @@ -0,0 +1,25 @@ +Fixes CVE-2012-3525 + +Obtained-from: https://github.com/Jabberd2/jabberd2/commit/aabcffae560d5fd00cd1d2ffce5d760353cf0a4d.diff +diff --git a/s2s/out.c b/s2s/out.c +index 0ed9b30..7b9f44f 100644 +--- s2s/out.c ++++ s2s/out.c +@@ -1661,7 +1661,7 @@ static void _out_result(conn_t out, nad_t nad) { + rkeylen = strlen(rkey); + + /* key is valid */ +- if(nad_find_attr(nad, 0, -1, "type", "valid") >= 0) { ++ if(nad_find_attr(nad, 0, -1, "type", "valid") >= 0 && xhash_get(out->states, rkey) == (void*) conn_INPROGRESS) { + log_write(out->s2s->log, LOG_NOTICE, "[%d] [%s, port=%d] outgoing route '%s' is now valid%s%s", out->fd->fd, out->ip, out->port, rkey, (out->s->flags & SX_SSL_WRAPPER) ? ", TLS negotiated" : "", out->s->compressed ? ", ZLIB compression enabled" : ""); + + xhash_put(out->states, pstrdup(xhash_pool(out->states), rkey), (void *) conn_VALID); /* !!! small leak here */ +@@ -1749,7 +1749,7 @@ static void _out_verify(conn_t out, nad_t nad) { + rkey = s2s_route_key(NULL, to->domain, from->domain); + + attr = nad_find_attr(nad, 0, -1, "type", "valid"); +- if(attr >= 0) { ++ if(attr >= 0 && xhash_get(in->states, rkey) == (void*) conn_INPROGRESS) { + xhash_put(in->states, pstrdup(xhash_pool(in->states), rkey), (void *) conn_VALID); + log_write(in->s2s->log, LOG_NOTICE, "[%d] [%s, port=%d] incoming route '%s' is now valid%s%s", in->fd->fd, in->ip, in->port, rkey, (in->s->flags & SX_SSL_WRAPPER) ? ", TLS negotiated" : "", in->s->compressed ? ", ZLIB compression enabled" : ""); + valid = 1; |