From owner-svn-src-all@FreeBSD.ORG  Fri Jan 15 07:05:00 2010
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 893B7106566B;
	Fri, 15 Jan 2010 07:05:00 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 785178FC1E;
	Fri, 15 Jan 2010 07:05:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0F750Rw080814;
	Fri, 15 Jan 2010 07:05:00 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0F750Oh080811;
	Fri, 15 Jan 2010 07:05:00 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201001150705.o0F750Oh080811@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 15 Jan 2010 07:05:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202341 - head/sys/compat/linux
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 15 Jan 2010 07:05:00 -0000

Author: brooks
Date: Fri Jan 15 07:05:00 2010
New Revision: 202341
URL: http://svn.freebsd.org/changeset/base/202341

Log:
  Since all other comparisons involving ngroups_max use
  "ngroups_max + 1", use ">= ngroups_max+1" instead of the equivalent
  "> ngroups_max" to reduce confusion.

Modified:
  head/sys/compat/linux/linux_misc.c
  head/sys/compat/linux/linux_uid16.c

Modified: head/sys/compat/linux/linux_misc.c
==============================================================================
--- head/sys/compat/linux/linux_misc.c	Fri Jan 15 04:09:22 2010	(r202340)
+++ head/sys/compat/linux/linux_misc.c	Fri Jan 15 07:05:00 2010	(r202341)
@@ -1138,7 +1138,7 @@ linux_setgroups(struct thread *td, struc
 	struct proc *p;
 
 	ngrp = args->gidsetsize;
-	if (ngrp < 0 || ngrp > ngroups_max)
+	if (ngrp < 0 || ngrp >= ngroups_max + 1)
 		return (EINVAL);
 	linux_gidset = malloc(ngrp * sizeof(*linux_gidset), M_TEMP, M_WAITOK);
 	error = copyin(args->grouplist, linux_gidset, ngrp * sizeof(l_gid_t));

Modified: head/sys/compat/linux/linux_uid16.c
==============================================================================
--- head/sys/compat/linux/linux_uid16.c	Fri Jan 15 04:09:22 2010	(r202340)
+++ head/sys/compat/linux/linux_uid16.c	Fri Jan 15 07:05:00 2010	(r202341)
@@ -109,7 +109,7 @@ linux_setgroups16(struct thread *td, str
 #endif
 
 	ngrp = args->gidsetsize;
-	if (ngrp < 0 || ngrp > ngroups_max)
+	if (ngrp < 0 || ngrp >= ngroups_max + 1)
 		return (EINVAL);
 	linux_gidset = malloc(ngrp * sizeof(*linux_gidset), M_TEMP, M_WAITOK);
 	error = copyin(args->gidset, linux_gidset, ngrp * sizeof(l_gid16_t));