From owner-svn-src-all@FreeBSD.ORG  Sat Mar 16 23:19:14 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 0F5374DD;
 Sat, 16 Mar 2013 23:19:14 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 02431864;
 Sat, 16 Mar 2013 23:19:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2GNJDmb047068;
 Sat, 16 Mar 2013 23:19:13 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2GNJDFL047067;
 Sat, 16 Mar 2013 23:19:13 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201303162319.r2GNJDFL047067@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sat, 16 Mar 2013 23:19:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248397 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Sat, 16 Mar 2013 23:19:14 -0000

Author: pjd
Date: Sat Mar 16 23:19:13 2013
New Revision: 248397
URL: http://svnweb.freebsd.org/changeset/base/248397

Log:
  Require CAP_SEEK if both O_APPEND and O_TRUNC flags are absent.
  
  In other words we don't require CAP_SEEK if either O_APPEND or O_TRUNC flag is
  given, because O_APPEND doesn't allow to overwrite existing data and O_TRUNC
  requires CAP_FTRUNCATE already.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/kern/vfs_syscalls.c

Modified: head/sys/kern/vfs_syscalls.c
==============================================================================
--- head/sys/kern/vfs_syscalls.c	Sat Mar 16 23:13:49 2013	(r248396)
+++ head/sys/kern/vfs_syscalls.c	Sat Mar 16 23:19:13 2013	(r248397)
@@ -971,7 +971,7 @@ flags_to_rights(int flags)
 			/* FALLTHROUGH */
 		case O_WRONLY:
 			rights |= CAP_WRITE;
-			if (!(flags & O_APPEND))
+			if (!(flags & (O_APPEND | O_TRUNC)))
 				rights |= CAP_SEEK;
 			break;
 		}