From owner-svn-src-head@FreeBSD.ORG  Fri Jul 26 22:40:17 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id E0BCBFC4;
 Fri, 26 Jul 2013 22:40:17 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CCEC6245A;
 Fri, 26 Jul 2013 22:40:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6QMeHMK062247;
 Fri, 26 Jul 2013 22:40:17 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6QMeHBX062246;
 Fri, 26 Jul 2013 22:40:17 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201307262240.r6QMeHBX062246@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 26 Jul 2013 22:40:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253692 - head/contrib/bind9/lib/dns/rdata/generic
 releng/8.4 releng/8.4/contrib/bind9/lib/dns/rdata/generic releng/8.4/sys/conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Jul 2013 22:40:18 -0000

Author: delphij
Date: Fri Jul 26 22:40:17 2013
New Revision: 253692
URL: http://svnweb.freebsd.org/changeset/base/253692

Log:
  Fix Denial of Service vulnerability in named(8). [13:07]
  
  Security:	CVE-2013-4854
  Security:	FreeBSD-SA-13:07.bind
  Approved by:	so

Modified:
  head/contrib/bind9/lib/dns/rdata/generic/keydata_65533.c

Changes in other areas also in this revision:
Modified:
  releng/8.4/UPDATING
  releng/8.4/contrib/bind9/lib/dns/rdata/generic/keydata_65533.c
  releng/8.4/sys/conf/newvers.sh

Modified: head/contrib/bind9/lib/dns/rdata/generic/keydata_65533.c
==============================================================================
--- head/contrib/bind9/lib/dns/rdata/generic/keydata_65533.c	Fri Jul 26 22:04:11 2013	(r253691)
+++ head/contrib/bind9/lib/dns/rdata/generic/keydata_65533.c	Fri Jul 26 22:40:17 2013	(r253692)
@@ -176,7 +176,7 @@ fromwire_keydata(ARGS_FROMWIRE) {
 	UNUSED(options);
 
 	isc_buffer_activeregion(source, &sr);
-	if (sr.length < 4)
+	if (sr.length < 16)
 		return (ISC_R_UNEXPECTEDEND);
 
 	isc_buffer_forward(source, sr.length);