From owner-p4-projects@FreeBSD.ORG  Mon Sep 15 20:39:09 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B9E0D106567E; Mon, 15 Sep 2008 20:39:09 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7C747106566B
	for <perforce@FreeBSD.org>; Mon, 15 Sep 2008 20:39:09 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 67E908FC13
	for <perforce@FreeBSD.org>; Mon, 15 Sep 2008 20:39:09 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8FKd9rC097562
	for <perforce@FreeBSD.org>; Mon, 15 Sep 2008 20:39:09 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8FKd9M0097560
	for perforce@freebsd.org; Mon, 15 Sep 2008 20:39:09 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 15 Sep 2008 20:39:09 GMT
Message-Id: <200809152039.m8FKd9M0097560@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 149823 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Sep 2008 20:39:10 -0000

http://perforce.freebsd.org/chv.cgi?CH=149823

Change 149823 by hselasky@hselasky_laptop001 on 2008/09/15 20:39:06

	
	Make sure the real access information is returned 
	and not the effective access information.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#33 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#33 (text+ko) ====

@@ -351,7 +351,6 @@
 	    (pdst->iface_index >= USB_IFACE_MAX)) {
 		return (EINVAL);
 	}
-retry:
 	if (level == 1)
 		devloc = USB_BUS_MAX;	/* use root-HUB to access bus */
 	else
@@ -403,21 +402,18 @@
 		pdst->user_id = psrc->uid;
 		pdst->group_id = psrc->gid;
 		pdst->mode = psrc->mode;
-		error = 0;
 	} else {
-		error = EINVAL;
+		/* access entry at this level and location is not active */
+		pdst->user_id = 0;
+		pdst->group_id = 0;
+		pdst->mode = 0;
 	}
 	mtx_unlock(&usb2_ref_lock);
 
 	if ((level > 0) && (level < 4)) {
 		usb2_unref_device(&loc);
-		if (error) {
-			/* try to find the permission one level down */
-			level--;
-			goto retry;
-		}
 	}
-	return (error);
+	return (0);
 }
 
 /*------------------------------------------------------------------------*