From owner-svn-src-head@freebsd.org  Mon Sep  7 20:05:57 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 B4F1C9CC099;
 Mon,  7 Sep 2015 20:05:57 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 A63551A2A;
 Mon,  7 Sep 2015 20:05:57 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t87K5vqN045626;
 Mon, 7 Sep 2015 20:05:57 GMT (envelope-from mjg@FreeBSD.org)
Received: (from mjg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t87K5vOS045625;
 Mon, 7 Sep 2015 20:05:57 GMT (envelope-from mjg@FreeBSD.org)
Message-Id: <201509072005.t87K5vOS045625@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org
 using -f
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Mon, 7 Sep 2015 20:05:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287540 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Sep 2015 20:05:57 -0000

Author: mjg
Date: Mon Sep  7 20:05:56 2015
New Revision: 287540
URL: https://svnweb.freebsd.org/changeset/base/287540

Log:
  fd: make rights a mandatory argument to fgetvp_rights
  
  The only caller already always passes rights.

Modified:
  head/sys/kern/kern_descrip.c

Modified: head/sys/kern/kern_descrip.c
==============================================================================
--- head/sys/kern/kern_descrip.c	Mon Sep  7 20:02:56 2015	(r287539)
+++ head/sys/kern/kern_descrip.c	Mon Sep  7 20:05:56 2015	(r287540)
@@ -2721,11 +2721,9 @@ fgetvp_rights(struct thread *td, int fd,
 		return (EBADF);
 
 #ifdef CAPABILITIES
-	if (needrightsp != NULL) {
-		error = cap_check(cap_rights(fdp, fd), needrightsp);
-		if (error != 0)
-			return (error);
-	}
+	error = cap_check(cap_rights(fdp, fd), needrightsp);
+	if (error != 0)
+		return (error);
 #endif
 
 	if (fp->f_vnode == NULL)