From owner-svn-ports-branches@freebsd.org Mon Dec 21 15:43:04 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9DC39A4DE29; Mon, 21 Dec 2015 15:43:04 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5730715B3; Mon, 21 Dec 2015 15:43:04 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBLFh3t9002858; Mon, 21 Dec 2015 15:43:03 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBLFh312002856; Mon, 21 Dec 2015 15:43:03 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201512211543.tBLFh312002856@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 21 Dec 2015 15:43:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404120 - in branches/2015Q4/irc/quassel: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Dec 2015 15:43:04 -0000 Author: feld Date: Mon Dec 21 15:43:03 2015 New Revision: 404120 URL: https://svnweb.freebsd.org/changeset/ports/404120 Log: MFH: r404119 irc/quassel: Import patch to resolve DoS CVE Approved by: ports-secteam (with hat) Security: CVE-2015-8547 Added: branches/2015Q4/irc/quassel/files/patch-src_core_coreuserinputhandler.cpp - copied unchanged from r404119, head/irc/quassel/files/patch-src_core_coreuserinputhandler.cpp Modified: branches/2015Q4/irc/quassel/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/irc/quassel/Makefile ============================================================================== --- branches/2015Q4/irc/quassel/Makefile Mon Dec 21 15:41:30 2015 (r404119) +++ branches/2015Q4/irc/quassel/Makefile Mon Dec 21 15:43:03 2015 (r404120) @@ -3,6 +3,7 @@ PORTNAME= quassel PORTVERSION= 0.11.1 +PORTREVISION= 1 CATEGORIES= irc MASTER_SITES= http://www.quassel-irc.org/pub/ Copied: branches/2015Q4/irc/quassel/files/patch-src_core_coreuserinputhandler.cpp (from r404119, head/irc/quassel/files/patch-src_core_coreuserinputhandler.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/irc/quassel/files/patch-src_core_coreuserinputhandler.cpp Mon Dec 21 15:43:03 2015 (r404120, copy of r404119, head/irc/quassel/files/patch-src_core_coreuserinputhandler.cpp) @@ -0,0 +1,12 @@ +Fix CVE-2015-8547 +--- src/core/coreuserinputhandler.cpp.orig 2015-04-23 20:47:17 UTC ++++ src/core/coreuserinputhandler.cpp +@@ -228,7 +228,7 @@ void CoreUserInputHandler::doMode(const + if (!isNumber || maxModes == 0) maxModes = 1; + + QStringList nickList; +- if (nicks == "*") { // All users in channel ++ if (nicks == "*" && bufferInfo.type() == BufferInfo::ChannelBuffer) { // All users in channel + const QList users = network()->ircChannel(bufferInfo.bufferName())->ircUsers(); + foreach(IrcUser *user, users) { + if ((addOrRemove == '+' && !network()->ircChannel(bufferInfo.bufferName())->userModes(user).contains(mode))