From owner-svn-src-stable@freebsd.org  Thu Apr 28 01:05:42 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 0A6B7B1E534;
 Thu, 28 Apr 2016 01:05:42 +0000 (UTC) (envelope-from pfg@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 D07321876;
 Thu, 28 Apr 2016 01:05:41 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3S15fsv012551;
 Thu, 28 Apr 2016 01:05:41 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3S15fWv012550;
 Thu, 28 Apr 2016 01:05:41 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201604280105.u3S15fWv012550@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Thu, 28 Apr 2016 01:05:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r298725 - stable/10/sys/fs/ext2fs
X-SVN-Group: stable-10
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.21
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Apr 2016 01:05:42 -0000

Author: pfg
Date: Thu Apr 28 01:05:40 2016
New Revision: 298725
URL: https://svnweb.freebsd.org/changeset/base/298725

Log:
  MFC r298518:
  ext2_htree_release(): prevent signed integer overflow in a loop.
  
  h_levels_num, as most data structs in ext2fs, is unsigned so
  the index that addresses it has to be unsigned as well.
  
  To get to overflow here we would probably be considering a
  degenerate case though.
  
  MFC after:	5 days

Modified:
  stable/10/sys/fs/ext2fs/ext2_htree.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/fs/ext2fs/ext2_htree.c
==============================================================================
--- stable/10/sys/fs/ext2fs/ext2_htree.c	Wed Apr 27 23:04:42 2016	(r298724)
+++ stable/10/sys/fs/ext2fs/ext2_htree.c	Thu Apr 28 01:05:40 2016	(r298725)
@@ -191,7 +191,7 @@ ext2_htree_set_limit(struct ext2fs_htree
 static void
 ext2_htree_release(struct ext2fs_htree_lookup_info *info)
 {
-	int i;
+	u_int i;
 
 	for (i = 0; i < info->h_levels_num; i++) {
 		struct buf *bp = info->h_levels[i].h_bp;