From owner-svn-src-stable@freebsd.org  Tue Aug  1 01:25:19 2017
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 3BAF9DC306D;
 Tue,  1 Aug 2017 01:25:19 +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 0811F71054;
 Tue,  1 Aug 2017 01:25:18 +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 v711PIgU046796;
 Tue, 1 Aug 2017 01:25:18 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v711PIUP046795;
 Tue, 1 Aug 2017 01:25:18 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201708010125.v711PIUP046795@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: Tue, 1 Aug 2017 01:25:18 +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: r321833 - stable/10/lib/libthr/thread
X-SVN-Group: stable-10
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: stable/10/lib/libthr/thread
X-SVN-Commit-Revision: 321833
X-SVN-Commit-Repository: base
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.23
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: Tue, 01 Aug 2017 01:25:19 -0000

Author: pfg
Date: Tue Aug  1 01:25:18 2017
New Revision: 321833
URL: https://svnweb.freebsd.org/changeset/base/321833

Log:
  MFC r320990, r321011:
  
  libthr: Avoid checking for negative values in usigned count.
  
  Check for overflow instead.

Modified:
  stable/10/lib/libthr/thread/thr_barrier.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libthr/thread/thr_barrier.c
==============================================================================
--- stable/10/lib/libthr/thread/thr_barrier.c	Tue Aug  1 01:23:55 2017	(r321832)
+++ stable/10/lib/libthr/thread/thr_barrier.c	Tue Aug  1 01:25:18 2017	(r321833)
@@ -83,7 +83,7 @@ _pthread_barrier_init(pthread_barrier_t *barrier,
 
 	(void)attr;
 
-	if (barrier == NULL || count <= 0)
+	if (barrier == NULL || count == 0 || count > INT_MAX)
 		return (EINVAL);
 
 	bar = calloc(1, sizeof(struct pthread_barrier));