From owner-svn-src-all@FreeBSD.ORG  Tue Jan 14 19:17:21 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 ESMTPS id CF0C2675;
 Tue, 14 Jan 2014 19:17:21 +0000 (UTC)
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 B81271617;
 Tue, 14 Jan 2014 19:17:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0EJHLbX008677;
 Tue, 14 Jan 2014 19:17:21 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0EJHLHU008676;
 Tue, 14 Jan 2014 19:17:21 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201401141917.s0EJHLHU008676@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 14 Jan 2014 19:17:21 +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: r260642 - in stable: 8/contrib/bsnmp/lib
 9/contrib/bsnmp/lib
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jan 2014 19:17:21 -0000

Author: delphij
Date: Tue Jan 14 19:17:20 2014
New Revision: 260642
URL: http://svnweb.freebsd.org/changeset/base/260642

Log:
  MFC r260636:
  
  Fix bsnmpd remote denial of service vulnerability.
  
  Reported by:	dinoex
  Submitted by:	harti
  Security:	FreeBSD-SA-14:01.bsnmpd
  Security:	CVE-2014-1452

Modified:
  stable/8/contrib/bsnmp/lib/snmpagent.c
Directory Properties:
  stable/8/contrib/bsnmp/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/9/contrib/bsnmp/lib/snmpagent.c
Directory Properties:
  stable/9/contrib/bsnmp/   (props changed)

Modified: stable/8/contrib/bsnmp/lib/snmpagent.c
==============================================================================
--- stable/8/contrib/bsnmp/lib/snmpagent.c	Tue Jan 14 19:12:40 2014	(r260641)
+++ stable/8/contrib/bsnmp/lib/snmpagent.c	Tue Jan 14 19:17:20 2014	(r260642)
@@ -488,6 +488,11 @@ snmp_getbulk(struct snmp_pdu *pdu, struc
 	for (cnt = 0; cnt < pdu->error_index; cnt++) {
 		eomib = 1;
 		for (i = non_rep; i < pdu->nbindings; i++) {
+
+			if (resp->nbindings == SNMP_MAX_BINDINGS)
+				/* PDU is full */
+				goto done;
+
 			if (cnt == 0) 
 				result = do_getnext(&context, &pdu->bindings[i],
 				    &resp->bindings[resp->nbindings], pdu);