From owner-svn-src-stable@FreeBSD.ORG  Fri Jul 26 22:53:18 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 82A4793B;
 Fri, 26 Jul 2013 22:53:18 +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 6EBE424CD;
 Fri, 26 Jul 2013 22:53:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6QMrICV071297;
 Fri, 26 Jul 2013 22:53:18 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6QMrIZw071296;
 Fri, 26 Jul 2013 22:53:18 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201307262253.r6QMrIZw071296@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 26 Jul 2013 22:53:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r253696 - stable/8/contrib/bind9/lib/dns/rdata/generic
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Jul 2013 22:53:18 -0000

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

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:
  stable/8/contrib/bind9/lib/dns/rdata/generic/keydata_65533.c

Modified: stable/8/contrib/bind9/lib/dns/rdata/generic/keydata_65533.c
==============================================================================
--- stable/8/contrib/bind9/lib/dns/rdata/generic/keydata_65533.c	Fri Jul 26 22:43:09 2013	(r253695)
+++ stable/8/contrib/bind9/lib/dns/rdata/generic/keydata_65533.c	Fri Jul 26 22:53:17 2013	(r253696)
@@ -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);